diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-21 16:45:33 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-21 16:45:33 +0200 |
| commit | 206f021b91066de1406a9a657237968dfea6b746 (patch) | |
| tree | 7638b98fe5d16eccfe283731c534c93037ec6056 /net/mac80211/offchannel.c | |
| parent | 8b6cf85427366305cde6adb56e40e14440b576f4 (diff) | |
| parent | 839cf7a236278ae358ff12141a168c0982fa0cd9 (diff) | |
| download | kernel_samsung_crespo-206f021b91066de1406a9a657237968dfea6b746.zip kernel_samsung_crespo-206f021b91066de1406a9a657237968dfea6b746.tar.gz kernel_samsung_crespo-206f021b91066de1406a9a657237968dfea6b746.tar.bz2 | |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'net/mac80211/offchannel.c')
| -rw-r--r-- | net/mac80211/offchannel.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 13427b1..c55eb9d 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -251,6 +251,22 @@ static void ieee80211_hw_roc_done(struct work_struct *work) return; } + /* was never transmitted */ + if (local->hw_roc_skb) { + u64 cookie; + + cookie = local->hw_roc_cookie ^ 2; + + cfg80211_mgmt_tx_status(local->hw_roc_dev, cookie, + local->hw_roc_skb->data, + local->hw_roc_skb->len, false, + GFP_KERNEL); + + kfree_skb(local->hw_roc_skb); + local->hw_roc_skb = NULL; + local->hw_roc_skb_for_status = NULL; + } + if (!local->hw_roc_for_tx) cfg80211_remain_on_channel_expired(local->hw_roc_dev, local->hw_roc_cookie, |