summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/17-netdev-queue
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-07 21:54:14 -0700
committerJohannes Berg <johannes.berg@intel.com>2013-05-08 09:02:54 +0200
commitfa6c4f66802adbdd3fb159f39664bb9eee6d9871 (patch)
tree2a8ba3733ac6175ddcead7f27a748c1d5deed2ae /patches/collateral-evolutions/network/17-netdev-queue
parentc9c99175e0d5221108622f2314e45cc62c7b6516 (diff)
backports: refresh patches for next-20130409
== ckmake-report.log == 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ] real 30m38.751s user 810m14.462s sys 126m48.932s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/17-netdev-queue')
-rw-r--r--patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
index 87adf23b..afe9ec4d 100644
--- a/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1638,6 +1638,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1649,6 +1649,7 @@ void ieee80211_sdata_stop(struct ieee802
* Remove all interfaces, may only be called at hardware unregistration
* time because it doesn't do RCU-safe list removals.
*/
@@ -8,7 +8,7 @@
void ieee80211_remove_interfaces(struct ieee80211_local *local)
{
struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1665,6 +1666,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1676,6 +1677,22 @@ void ieee80211_remove_interfaces(struct
kfree(sdata);
}
}