diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-09 22:12:09 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 22:12:09 +0100 |
| commit | a3cc2de9138f1ee1581f55927f33f7d72ed6207d (patch) | |
| tree | 4f0dbdb1b18bf24987485facb5e7800e242d932f /net/ieee80211 | |
| parent | NetXen: Updates for ethtool support (diff) | |
| parent | [PATCH] ieee80211: Fix sparse warning (diff) | |
| download | linux-a3cc2de9138f1ee1581f55927f33f7d72ed6207d.tar.xz linux-a3cc2de9138f1ee1581f55927f33f7d72ed6207d.zip | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net/ieee80211')
| -rw-r--r-- | net/ieee80211/ieee80211_tx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 854fc13cd78d..54e01160166f 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c @@ -502,9 +502,6 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) if (host_encrypt) ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len); else if (host_build_iv) { - struct ieee80211_crypt_data *crypt; - - crypt = ieee->crypt[ieee->tx_keyidx]; atomic_inc(&crypt->refcnt); if (crypt->ops->build_iv) crypt->ops->build_iv(skb_frag, hdr_len, |