diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-29 13:32:07 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-30 00:55:08 +0400 |
| commit | d0f09804144fd9471a13cf4d80e66842c7fa114f (patch) | |
| tree | 4a1f0f78bad7e5be4ad400397a19d4b8d6fbbdcd /drivers/net/wireless/ath5k/base.c | |
| parent | 0ccd58fc03f40529f66190b1a41e92a732d2bda8 (diff) | |
| download | linux-d0f09804144fd9471a13cf4d80e66842c7fa114f.tar.xz | |
mac80211: partially fix skb->cb use
This patch fixes mac80211 to not use the skb->cb over the queue step
from virtual interfaces to the master. The patch also, for now,
disables aggregation because that would still require requeuing,
will fix that in a separate patch. There are two other places (software
requeue and powersaving stations) where requeue can happen, but that is
not currently used by any drivers/not possible to use respectively.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath5k/base.c')
| -rw-r--r-- | drivers/net/wireless/ath5k/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 1106d1c06298..ff3fad794b61 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c @@ -1237,7 +1237,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) pktlen = skb->len; - if (!(info->flags & IEEE80211_TX_CTL_DO_NOT_ENCRYPT)) { + if (info->control.hw_key) { keyidx = info->control.hw_key->hw_key_idx; pktlen += info->control.icv_len; } |