diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-03-15 08:13:33 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-03-15 08:16:05 -0400 |
| commit | 73964d96a7a08f2de053d783efe97d3dd1a690a5 (patch) | |
| tree | cc6d9ad14f229b3f2555d914ae1f42e9f5d43e6d /mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch | |
| parent | 930f97403625d26472e5637bc203ac01205cc078 (diff) | |
| download | kernel-73964d96a7a08f2de053d783efe97d3dd1a690a5.tar.gz kernel-73964d96a7a08f2de053d783efe97d3dd1a690a5.tar.xz kernel-73964d96a7a08f2de053d783efe97d3dd1a690a5.zip | |
Linux v3.9-rc2-292-ga2362d2
- Fixes CVE-2013-1860 kernel: usb: cdc-wdm buffer overflow triggered by device
Diffstat (limited to 'mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch')
| -rw-r--r-- | mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch b/mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch index 81090e3ec..7d49d9834 100644 --- a/mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch +++ b/mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch @@ -1,40 +1,3 @@ -commit 801d929ca7d935ee199fd61d8ef914f51e892270 -Author: Felix Fietkau <nbd@openwrt.org> -Date: Sat Mar 2 19:05:47 2013 +0100 - - mac80211: another fix for idle handling in monitor mode - - When setting a monitor interface up or down, the idle state needs to be - recalculated, otherwise the hardware will just stay in its previous idle - state. - - Signed-off-by: Felix Fietkau <nbd@openwrt.org> - Signed-off-by: Johannes Berg <johannes.berg@intel.com> - -diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c -index 640afab..baaa860 100644 ---- a/net/mac80211/iface.c -+++ b/net/mac80211/iface.c -@@ -541,6 +541,9 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) - - ieee80211_adjust_monitor_flags(sdata, 1); - ieee80211_configure_filter(local); -+ mutex_lock(&local->mtx); -+ ieee80211_recalc_idle(local); -+ mutex_unlock(&local->mtx); - - netif_carrier_on(dev); - break; -@@ -812,6 +815,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, - - ieee80211_adjust_monitor_flags(sdata, -1); - ieee80211_configure_filter(local); -+ mutex_lock(&local->mtx); -+ ieee80211_recalc_idle(local); -+ mutex_unlock(&local->mtx); - break; - case NL80211_IFTYPE_P2P_DEVICE: - /* relies on synchronize_rcu() below */ diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index baaa860..7a3d675 100644 --- a/net/mac80211/iface.c |