summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-12-06 14:55:57 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-12-06 14:55:57 -0500
commit55cb0797fa779e36f62876a8aa44cbf3984e8d59 (patch)
treeea84d334ec666e558d3e4c6dd259a8f239374432 /net/mac80211
parent795e9364215dc98b1dea888ebae22383ecbbb92a (diff)
parent289814918ce3af1296ac7d9b05508bde64e97348 (diff)
Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
This is an NFC LLCP fix for 3.7 and contains only one patch. It fixes a potential crash when receiving an LLCP HDLC frame acking a frame that is not the last sent one. In that case we may dereference an already freed pointer.
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/offchannel.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 5abddfe3e101..a5379aea7d09 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -462,8 +462,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
list_move_tail(&roc->list, &tmp_list);
roc->abort = true;
}
-
- ieee80211_start_next_roc(local);
mutex_unlock(&local->mtx);
list_for_each_entry_safe(roc, tmp, &tmp_list, list) {