Linux v3.9-rc5-108-g118c9a4
This commit is contained in:
Justin M. Forbes
parent
d837c754a7
commit
f545817e3c
|
|
@ -141,16 +141,16 @@ diff --git a/net/wireless/core.h b/net/wireless/core.h
|
|||
index 9a2be8d..d5d06fd 100644
|
||||
--- a/net/wireless/core.h
|
||||
+++ b/net/wireless/core.h
|
||||
@@ -500,6 +500,9 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
|
||||
@@ -503,6 +503,9 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
|
||||
void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
|
||||
enum nl80211_iftype iftype, int num);
|
||||
|
||||
+void cfg80211_leave(struct cfg80211_registered_device *rdev,
|
||||
+ struct wireless_dev *wdev);
|
||||
+
|
||||
#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
|
||||
void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
|
||||
struct wireless_dev *wdev);
|
||||
|
||||
#ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS
|
||||
diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
|
||||
index 8c8b26f..d77e1c1 100644
|
||||
--- a/net/wireless/rdev-ops.h
|
||||
|
|
|
|||
14
kernel.spec
14
kernel.spec
|
|
@ -62,7 +62,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 2
|
||||
%global baserelease 301
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -95,7 +95,7 @@ Summary: The Linux kernel
|
|||
# The rc snapshot level
|
||||
%define rcrev 5
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
%define gitrev 1
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -731,9 +731,6 @@ Patch21262: x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
|
|||
Patch21273: cfg80211-mac80211-disconnect-on-suspend.patch
|
||||
Patch21274: mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
|
||||
|
||||
#rhbz 920218
|
||||
Patch21276: mac80211-Dont-restart-sta-timer-if-not-running.patch
|
||||
|
||||
#rhbz 859282
|
||||
Patch21275: VMX-x86-handle-host-TSC-calibration-failure.patch
|
||||
|
||||
|
|
@ -1441,9 +1438,6 @@ ApplyPatch mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
|
|||
#rhbz 859282
|
||||
ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
|
||||
|
||||
#rhbz 920218
|
||||
ApplyPatch mac80211-Dont-restart-sta-timer-if-not-running.patch
|
||||
|
||||
#rhbz 927469
|
||||
ApplyPatch fix-child-thread-introspection.patch
|
||||
|
||||
|
|
@ -2284,6 +2278,10 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Tue Apr 02 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git1.301
|
||||
- Linux v3.9-rc5-108-g118c9a4
|
||||
- Reenable debugging options.
|
||||
|
||||
* Tue Apr 02 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
- Enable CONFIG_FB_MATROX_G on powerpc
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
From: Ben Greear <greearb@candelatech.com>
|
||||
|
||||
I found another crash when deleting lots of virtual stations
|
||||
in a congested environment. I think the problem is that
|
||||
the ieee80211_mlme_notify_scan_completed could call
|
||||
ieee80211_restart_sta_timer for a stopped interface
|
||||
that was about to be deleted. Fix similar problem for
|
||||
mesh interfaces as well.
|
||||
|
||||
Signed-off-by: Ben Greear <greearb@candelatech.com>
|
||||
---
|
||||
v4: Fix up mesh as well, add check in calling code instead of
|
||||
in the methods that mucks iwth the timers.
|
||||
|
||||
:100644 100644 67fcfdf... 02e3d75... M net/mac80211/mesh.c
|
||||
:100644 100644 aec786d... 1d237e9... M net/mac80211/mlme.c
|
||||
net/mac80211/mesh.c | 3 ++-
|
||||
net/mac80211/mlme.c | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
|
||||
index 67fcfdf..02e3d75 100644
|
||||
--- a/net/mac80211/mesh.c
|
||||
+++ b/net/mac80211/mesh.c
|
||||
@@ -779,7 +779,8 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
|
||||
|
||||
rcu_read_lock();
|
||||
list_for_each_entry_rcu(sdata, &local->interfaces, list)
|
||||
- if (ieee80211_vif_is_mesh(&sdata->vif))
|
||||
+ if (ieee80211_sdata_running(sdata)
|
||||
+ && ieee80211_vif_is_mesh(&sdata->vif))
|
||||
ieee80211_queue_work(&local->hw, &sdata->work);
|
||||
rcu_read_unlock();
|
||||
}
|
||||
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
|
||||
index aec786d..1d237e9 100644
|
||||
--- a/net/mac80211/mlme.c
|
||||
+++ b/net/mac80211/mlme.c
|
||||
@@ -3054,7 +3054,8 @@ void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local)
|
||||
/* Restart STA timers */
|
||||
rcu_read_lock();
|
||||
list_for_each_entry_rcu(sdata, &local->interfaces, list)
|
||||
- ieee80211_restart_sta_timer(sdata);
|
||||
+ if (ieee80211_sdata_running(sdata))
|
||||
+ ieee80211_restart_sta_timer(sdata);
|
||||
rcu_read_unlock();
|
||||
}
|
||||
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
Loading…
Reference in New Issue