diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-11-25 10:02:30 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-29 15:24:35 -0500 |
| commit | f30221e4ec62d905b56d5e8f7ccab6b406a97cf5 (patch) | |
| tree | 07d3a4cf6da15a3622dd79c1d72e0e5c9201566a /net/mac80211/status.c | |
| parent | f7ca38dfe58c20cb1aa2ed9643187e8b194b5bae (diff) | |
| download | linux-3.10-f30221e4ec62d905b56d5e8f7ccab6b406a97cf5.tar.gz linux-3.10-f30221e4ec62d905b56d5e8f7ccab6b406a97cf5.tar.bz2 linux-3.10-f30221e4ec62d905b56d5e8f7ccab6b406a97cf5.zip | |
mac80211: implement off-channel mgmt TX
This implements the new off-channel TX API
in mac80211 with a new work item type. The
operation doesn't add a new work item when
we're on the right channel and there's no
wait time so that for example p2p probe
responses will be transmitted without delay.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/status.c')
| -rw-r--r-- | net/mac80211/status.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index bed7e32ed90..4958710a7d9 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -321,10 +321,23 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) msecs_to_jiffies(10)); } - if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) + if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) { + struct ieee80211_work *wk; + + rcu_read_lock(); + list_for_each_entry_rcu(wk, &local->work_list, list) { + if (wk->type != IEEE80211_WORK_OFFCHANNEL_TX) + continue; + if (wk->offchan_tx.frame != skb) + continue; + wk->offchan_tx.frame = NULL; + break; + } + rcu_read_unlock(); cfg80211_mgmt_tx_status( skb->dev, (unsigned long) skb, skb->data, skb->len, !!(info->flags & IEEE80211_TX_STAT_ACK), GFP_ATOMIC); + } /* this was a transmitted frame, but now we want to reuse it */ skb_orphan(skb); |