diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-29 08:16:31 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-29 08:16:31 +0000 |
| commit | 542b91ec01eaa33284cea3397bee4e9afda277f9 (patch) | |
| tree | 93e326a234e4bcb447dc7dbf2201c75033e3661e /package/mac80211/patches/580-mac80211_tx_status_crash.patch | |
| parent | c4f6306026c54096346255a8bda3d9dc60e58a96 (diff) | |
mac80211: reorganize patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33289 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/580-mac80211_tx_status_crash.patch')
| -rw-r--r-- | package/mac80211/patches/580-mac80211_tx_status_crash.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/package/mac80211/patches/580-mac80211_tx_status_crash.patch b/package/mac80211/patches/580-mac80211_tx_status_crash.patch deleted file mode 100644 index abcf56e1d..000000000 --- a/package/mac80211/patches/580-mac80211_tx_status_crash.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/net/mac80211/status.c -+++ b/net/mac80211/status.c -@@ -517,6 +517,8 @@ void ieee80211_tx_status(struct ieee8021 - - if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) { - u64 cookie = (unsigned long)skb; -+ bool found = false; -+ - acked = info->flags & IEEE80211_TX_STAT_ACK; - - /* -@@ -524,8 +526,18 @@ void ieee80211_tx_status(struct ieee8021 - * we cannot use skb->dev->ieee80211_ptr - */ - -- if (ieee80211_is_nullfunc(hdr->frame_control) || -- ieee80211_is_qos_nullfunc(hdr->frame_control)) -+ list_for_each_entry_rcu(sdata, &local->interfaces, list) { -+ if (skb->dev != sdata->dev) -+ continue; -+ -+ found = true; -+ break; -+ } -+ -+ if (!found) -+ skb->dev = NULL; -+ else if (ieee80211_is_nullfunc(hdr->frame_control) || -+ ieee80211_is_qos_nullfunc(hdr->frame_control)) - cfg80211_probe_status(skb->dev, hdr->addr1, - cookie, acked, GFP_ATOMIC); - else |