diff options
| author | Sujith <Sujith.Manoharan@atheros.com> | 2009-11-18 11:42:14 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-11-18 17:09:25 -0500 |
| commit | 0bc6b1871c111d8f2eb2ac022a705de4cf21f572 (patch) | |
| tree | 92abeacaf7e71dd8c1e8bde713f663c88a700085 /net/mac80211 | |
| parent | 24b6b15f7d07d26330f73057d618089976a08792 (diff) | |
| download | linux-3.10-0bc6b1871c111d8f2eb2ac022a705de4cf21f572.tar.gz linux-3.10-0bc6b1871c111d8f2eb2ac022a705de4cf21f572.tar.bz2 linux-3.10-0bc6b1871c111d8f2eb2ac022a705de4cf21f572.zip | |
mac80211: Fix panic in aggregation handling
Not assigning the vif pointer causes an oops.
This patch fixes it.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/agg-tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 6ddd11466df..26d42e88808 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -489,6 +489,7 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, ra_tid = (struct ieee80211_ra_tid *) &skb->cb; memcpy(&ra_tid->ra, ra, ETH_ALEN); ra_tid->tid = tid; + ra_tid->vif = vif; skb->pkt_type = IEEE80211_ADDBA_MSG; skb_queue_tail(&local->skb_queue, skb); @@ -625,6 +626,7 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, ra_tid = (struct ieee80211_ra_tid *) &skb->cb; memcpy(&ra_tid->ra, ra, ETH_ALEN); ra_tid->tid = tid; + ra_tid->vif = vif; skb->pkt_type = IEEE80211_DELBA_MSG; skb_queue_tail(&local->skb_queue, skb); |