diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-09 14:23:30 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-09 14:23:30 -0400 |
| commit | e23535ca11525945bd7fca05ac5941efba232498 (patch) | |
| tree | 43ddf01415e60988b73f832d97ca2c07a6f8053e /net/mac80211/tx.c | |
| parent | 0c1ad04aecb975f2a2014e1bc5a2fa23923ecbd9 (diff) | |
| parent | 51e65257142a87fe46a1ce5c35c86c5baf012614 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 64e0f7587e6d..3104c844b544 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1480,7 +1480,12 @@ static int ieee80211_skb_resize(struct ieee80211_local *local, { int tail_need = 0; - if (may_encrypt && local->crypto_tx_tailroom_needed_cnt) { + /* + * This could be optimised, devices that do full hardware + * crypto (including TKIP MMIC) need no tailroom... But we + * have no drivers for such devices currently. + */ + if (may_encrypt) { tail_need = IEEE80211_ENCRYPT_TAILROOM; tail_need -= skb_tailroom(skb); tail_need = max_t(int, tail_need, 0); |