diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:39:05 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:39:05 -0800 |
commit | cf10b2853f86e714eac7117484c0d368ce710fa4 (patch) | |
tree | 6f1574a9de786c8c345ac852eff12d65b2d75bfe /net/ieee80211/ieee80211_tx.c | |
parent | 14591de147f7c9656fa2b9c05680d2b46e286c40 (diff) | |
parent | 166c3436d683cfe5316c7723ed746a93db053f12 (diff) | |
download | linux-cf10b2853f86e714eac7117484c0d368ce710fa4.tar.bz2 |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
-rw-r--r-- | net/ieee80211/ieee80211_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 445f206e65e0..e5b33c8d5dbc 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c @@ -288,7 +288,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) /* Determine total amount of storage required for TXB packets */ bytes = skb->len + SNAP_SIZE + sizeof(u16); - if (host_encrypt) + if (host_encrypt || host_build_iv) fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA | IEEE80211_FCTL_PROTECTED; else |