lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

Browse Source
This commit is contained in:
Jeff Garzik
2007-02-09 16:12:09 -05:00
parent e45d9ab405 46b8c85e1d
commit a3cc2de913
9 changed files with 210 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ieee80211/ieee80211_tx.c
View File

@@ -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,