diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-08 10:36:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-08 10:36:51 -0700 |
| commit | 94b105723a3bfca45c75916423cd959ce71ed215 (patch) | |
| tree | 3138e19c9511738436dc75f773acde596f5973a2 /net | |
| parent | b530fb69cf54cf22768a3eabc0604d70b5c13fde (diff) | |
| parent | 4efe7f51be508a13965f163006dcb32b38a914a3 (diff) | |
| download | op-kernel-dev-94b105723a3bfca45c75916423cd959ce71ed215.zip op-kernel-dev-94b105723a3bfca45c75916423cd959ce71ed215.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/agg-tx.c | 2 | ||||
| -rw-r--r-- | net/mac80211/status.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index c893f23..8f23401 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -175,6 +175,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state); + del_timer_sync(&tid_tx->addba_resp_timer); + /* * After this packets are no longer handed right through * to the driver but are put onto tid_tx->pending instead, diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 10caec5..34da679 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -377,7 +377,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) skb2 = skb_clone(skb, GFP_ATOMIC); if (skb2) { skb2->dev = prev_dev; - netif_receive_skb(skb2); + netif_rx(skb2); } } @@ -386,7 +386,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) } if (prev_dev) { skb->dev = prev_dev; - netif_receive_skb(skb); + netif_rx(skb); skb = NULL; } rcu_read_unlock(); |
