summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-12 00:09:09 +0000
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-17 16:23:08 -0700
commit066bb19bcf0f55109f5780e8ed0c2786f4462932 (patch)
treecd6a2676df79f0d3f677006d8fefb18f27adad70 /patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
parentbe4a0f9ad7e17670d7a30c9e94d5dd918425f90a (diff)
backports: refresh patches for next-20140409 and next-20140411
We were required to refresh patches for next-20140409 but for next-20140411 no changes were required. Since no actual commit is necessary next time this happens (which can often, hence -- automatic backports --) I'll just peg the results on the PGP signed tag for the release. I'll peg this commit with both next tags because of this. Just run git describe to find out the respective linux-next tag you should be using as that is the latest validated one. mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean --refresh \ /home/mcgrof/linux-next /home/mcgrof/build/next-20140409 Copy original source files ... Apply patches ... Modify Kconfig tree ... Rewrite Makefiles and Kconfig files ... Done! real 1m30.186s user 9m25.180s sys 0m24.428s mcgrof@drvbp1 ~/build/next-20140409 $ time ckmake --allyesconfig 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.54 [ OK ] 4 3.3.8 [ OK ] 5 3.4.79 [ 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.29 [ OK ] 12 3.11.10 [ OK ] 13 3.12.10 [ OK ] 14 3.13.2 [ OK ] 15 3.14-rc1 [ OK ] real 26m54.859s user 744m15.764s sys 83m47.440s mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean --refresh /home/mcgrof/linux-next /home/mcgrof/build/next-20140411 Copy original source files ... Apply patches ... Modify Kconfig tree ... Rewrite Makefiles and Kconfig files ... Done! real 1m30.437s user 9m22.812s sys 0m24.484s 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.54 [ OK ] 4 3.3.8 [ OK ] 5 3.4.79 [ 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.29 [ OK ] 12 3.11.10 [ OK ] 13 3.12.10 [ OK ] 14 3.13.2 [ OK ] 15 3.14-rc1 [ OK ] real 28m21.215s user 786m8.468s sys 86m46.564s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/0028-select_queue/mac80211.patch')
-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 b4b81512..2e695f5b 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
@@ -2,7 +2,7 @@ diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 088111a..dcf149a 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1062,10 +1062,19 @@ static void ieee80211_uninit(struct net_
+@@ -1052,10 +1052,19 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -22,7 +22,7 @@ index 088111a..dcf149a 100644
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1081,10 +1090,19 @@ static const struct net_device_ops ieee8
+@@ -1071,10 +1080,19 @@ static const struct net_device_ops ieee8
.ndo_select_queue = ieee80211_netdev_select_queue,
};