diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-11 01:45:20 +0000 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-17 16:23:08 -0700 |
commit | be4a0f9ad7e17670d7a30c9e94d5dd918425f90a (patch) | |
tree | e357fbef6a8bd452136a59c59a0b654d666d38a8 /patches/collateral-evolutions/network/0030-qdisc_tx_busylock | |
parent | 0429914b5f1cb02830dbc4200d615abd9b3f2f7c (diff) |
backports: nuke support for kernels < 3.0
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean
/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
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/0030-qdisc_tx_busylock')
-rw-r--r-- | patches/collateral-evolutions/network/0030-qdisc_tx_busylock/INFO | 22 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/INFO b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/INFO new file mode 100644 index 00000000..e5d96233 --- /dev/null +++ b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/INFO @@ -0,0 +1,22 @@ +struct net_device got an extension with the member qdisc_tx_busylock +as of commit 23d3b8bfb. For older kernels we need to ifdef around that +as its now available. + +mcgrof@ergon ~/linux (git::master)$ git describe --contains 23d3b8bfb +v3.7-rc1~145^2~208 + +commit 23d3b8bfb8eb20e7d96afa09991e6a5ed1c83164 +Author: Eric Dumazet <edumazet@google.com> +Date: Wed Sep 5 01:02:56 2012 +0000 + + net: qdisc busylock needs lockdep annotations + + It seems we need to provide ability for stacked devices + to use specific lock_class_key for sch->busylock + + We could instead default l2tpeth tx_queue_len to 0 (no qdisc), but + a user might use a qdisc anyway. + + (So same fixes are probably needed on non LLTX stacked drivers) + +[ the commit log goes we only include up to here to help with context ] diff --git a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch new file mode 100644 index 00000000..039fa6f7 --- /dev/null +++ b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch @@ -0,0 +1,22 @@ +--- a/net/ieee802154/6lowpan_rtnl.c ++++ b/net/ieee802154/6lowpan_rtnl.c +@@ -384,7 +384,9 @@ static struct header_ops lowpan_header_o + .create = lowpan_header_create, + }; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) + static struct lock_class_key lowpan_tx_busylock; ++#endif + static struct lock_class_key lowpan_netdev_xmit_lock_key; + + static void lowpan_set_lockdep_class_one(struct net_device *dev, +@@ -399,7 +401,9 @@ static void lowpan_set_lockdep_class_one + static int lowpan_dev_init(struct net_device *dev) + { + netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) + dev->qdisc_tx_busylock = &lowpan_tx_busylock; ++#endif + return 0; + } + |