summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/17-netdev-queue
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-05-31 21:15:24 +0200
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-06-05 20:41:38 -0700
commitb13970c3395d5fca038a7227a633e52c192883da (patch)
tree57b6b3edb429b51508a01b419a71c3c9550e2a4d /patches/collateral-evolutions/network/17-netdev-queue
parent0f0c6cf97b8881222966878a88d2d2e4e4587527 (diff)
backports: refresh patches for next-20130531backports-20130531
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.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/17-netdev-queue')
-rw-r--r--patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch6
1 files changed, 3 insertions, 3 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 7a4404d4..c2aa04d1 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
-@@ -1690,6 +1690,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1711,6 +1711,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;
-@@ -1717,6 +1718,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1747,6 +1748,22 @@ void ieee80211_remove_interfaces(struct
kfree(sdata);
}
}
@@ -30,4 +30,4 @@
+#endif
static int netdev_notify(struct notifier_block *nb,
- unsigned long state,
+ unsigned long state, void *ptr)