Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / net / wireless / ipw2x00 / libipw_tx.c

diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c
index da8beac7fcf36e9d57bc1db928d83b6e54f6b80d..01c88a71abe19a47da929e664e38f3656f4dd668 100644 (file)
--- a/drivers/net/wireless/ipw2x00/libipw_tx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_tx.c
@@ -260,7 +260,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
        int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size,
            rts_required;
        unsigned long flags;
-       int encrypt, host_encrypt, host_encrypt_msdu, host_build_iv;
+       int encrypt, host_encrypt, host_encrypt_msdu;
        __be16 ether_type;
        int bytes, fc, hdr_len;
        struct sk_buff *skb_frag;
@@ -301,7 +301,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
 
        host_encrypt = ieee->host_encrypt && encrypt && crypt;
        host_encrypt_msdu = ieee->host_encrypt_msdu && encrypt && crypt;
-       host_build_iv = ieee->host_build_iv && encrypt && crypt;
 
        if (!encrypt && ieee->ieee802_1x &&
            ieee->drop_unencrypted && ether_type != htons(ETH_P_PAE)) {
@@ -313,7 +312,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
        skb_copy_from_linear_data(skb, dest, ETH_ALEN);
        skb_copy_from_linear_data_offset(skb, ETH_ALEN, src, ETH_ALEN);
 
-       if (host_encrypt || host_build_iv)
+       if (host_encrypt)
                fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
                    IEEE80211_FCTL_PROTECTED;
        else
@@ -467,7 +466,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
        for (; i < nr_frags; i++) {
                skb_frag = txb->fragments[i];
 
-               if (host_encrypt || host_build_iv)
+               if (host_encrypt)
                        skb_reserve(skb_frag,
                                    crypt->ops->extra_mpdu_prefix_len);
 
@@ -502,15 +501,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
                 * to insert the IV between the header and the payload */
                if (host_encrypt)
                        libipw_encrypt_fragment(ieee, skb_frag, hdr_len);
-               else if (host_build_iv) {
-                       atomic_inc(&crypt->refcnt);
-                       if (crypt->ops->build_iv)
-                               crypt->ops->build_iv(skb_frag, hdr_len,
-                                     ieee->sec.keys[ieee->sec.active_key],
-                                     ieee->sec.key_sizes[ieee->sec.active_key],
-                                     crypt->priv);
-                       atomic_dec(&crypt->refcnt);
-               }
 
                if (ieee->config &
                    (CFG_LIBIPW_COMPUTE_FCS | CFG_LIBIPW_RESERVE_FCS))