summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0028-select_queue
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-06-08 17:52:19 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-06-16 20:23:38 +0200
commit53d587450dd4de32d5f9bbc03794359b020f35d5 (patch)
treece48ee48f6a4829070fdbf503284723872c513db /patches/collateral-evolutions/network/0028-select_queue
parentf57a7a04ef74d1d40af44d9fda0e9ebbe6bde65a (diff)
backports: refresh patches on next-20140606backports-20140606
There were manual changes ineeded in the following files: patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.59 [ OK ] 4 3.3.8 [ OK ] 5 3.4.91 [ 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.40 [ OK ] 12 3.11.10 [ OK ] 13 3.12.20 [ OK ] 14 3.13.11 [ OK ] 15 3.14.4 [ OK ] 16 3.15-rc7 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0028-select_queue')
-rw-r--r--patches/collateral-evolutions/network/0028-select_queue/mac80211.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
index 2290203e..12eea54c 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
-@@ -1063,10 +1063,19 @@ static void ieee80211_uninit(struct net_
+@@ -1071,10 +1071,19 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -20,7 +20,7 @@
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1082,10 +1091,19 @@ static const struct net_device_ops ieee8
+@@ -1090,10 +1099,19 @@ static const struct net_device_ops ieee8
.ndo_select_queue = ieee80211_netdev_select_queue,
};