summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-05-10 23:50:42 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2015-05-11 23:46:22 +0200
commit9166e4b22f02d0cc2e3745b5da88ec21991e494a (patch)
tree935cb480876f51096b5ed5fd59d3e1e9c4f5b82a /patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
parent5c009a34f1a0fe52f4f4e2dd2d5be0a94a9274e3 (diff)
patches: refresh patches on next-20150511backports-20150511
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.68 [ OK ] 4 3.3.8 [ OK ] 5 3.4.107 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.75 [ OK ] 12 3.11.10 [ OK ] 13 3.12.40 [ OK ] 14 3.13.11 [ OK ] 15 3.14.39 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.12 [ OK ] 20 3.19.5 [ OK ] 21 4.0.0 [ OK ] 22 4.1-rc1 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0028-select_queue/mac80211.patch')
-rw-r--r--patches/collateral-evolutions/network/0028-select_queue/mac80211.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
index f9691ef3..7b4aa489 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1101,10 +1101,20 @@ static void ieee80211_uninit(struct net_
+@@ -1088,10 +1088,20 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -21,8 +21,8 @@
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1120,10 +1130,20 @@ static const struct net_device_ops ieee8
- .ndo_select_queue = ieee80211_netdev_select_queue,
+@@ -1137,10 +1147,20 @@ static const struct net_device_ops ieee8
+ .ndo_get_stats64 = ieee80211_get_stats64,
};
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0) || \