From 1f4af51943861539df14c1d1cf6c36c8af65cc9c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 25 Oct 2014 13:55:02 +0200 Subject: backports: refresh patches on v3.18-rc1 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.104 [ 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.58 [ OK ] 12 3.11.10 [ OK ] 13 3.12.31 [ OK ] 14 3.13.11 [ OK ] 15 3.14.22 [ OK ] 16 3.15.10 [ OK ] 17 3.16.6 [ OK ] 18 3.17.1 [ OK ] 19 3.18-rc1 [ OK ] Signed-off-by: Hauke Mehrtens --- .../network/0006-ieee802154-6lowpan-namespace.patch | 2 +- .../network/0007-lowpan-inet_frag_lru_move.patch | 2 +- patches/collateral-evolutions/network/0008-net-user-ns.patch | 2 +- .../network/0030-qdisc_tx_busylock/ieee802154.patch | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch b/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch index 7e1fef30..bcf95445 100644 --- a/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch +++ b/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch @@ -16,7 +16,7 @@ idea yet. spin_lock(&fq->q.lock); -@@ -395,24 +399,44 @@ static int zero; +@@ -393,24 +397,44 @@ static int zero; static struct ctl_table lowpan_frags_ns_ctl_table[] = { { .procname = "6lowpanfrag_high_thresh", diff --git a/patches/collateral-evolutions/network/0007-lowpan-inet_frag_lru_move.patch b/patches/collateral-evolutions/network/0007-lowpan-inet_frag_lru_move.patch index d0b2c67c..de22c920 100644 --- a/patches/collateral-evolutions/network/0007-lowpan-inet_frag_lru_move.patch +++ b/patches/collateral-evolutions/network/0007-lowpan-inet_frag_lru_move.patch @@ -23,7 +23,7 @@ and then domain specific inet_frag_lru_move() define. +#include struct lowpan_create_arg { - u16 tag; + __be16 tag; @@ -19,8 +20,32 @@ struct lowpan_frag_queue { u16 d_size; struct ieee802154_addr saddr; diff --git a/patches/collateral-evolutions/network/0008-net-user-ns.patch b/patches/collateral-evolutions/network/0008-net-user-ns.patch index f2a7e5dc..02ae368b 100644 --- a/patches/collateral-evolutions/network/0008-net-user-ns.patch +++ b/patches/collateral-evolutions/network/0008-net-user-ns.patch @@ -3,7 +3,7 @@ via commit 038e7332b8. --- a/net/ieee802154/reassembly.c +++ b/net/ieee802154/reassembly.c -@@ -481,9 +481,11 @@ static int __net_init lowpan_frags_ns_sy +@@ -479,9 +479,11 @@ static int __net_init lowpan_frags_ns_sy table[1].extra2 = &ieee802154_lowpan->frags.high_thresh; table[2].data = &ieee802154_lowpan->frags.timeout; diff --git a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch index 7b0d9c79..0533c202 100644 --- a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch +++ b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch @@ -1,6 +1,6 @@ --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c -@@ -444,7 +444,9 @@ static struct header_ops lowpan_header_o +@@ -442,7 +442,9 @@ static struct header_ops lowpan_header_o .create = lowpan_header_create, }; @@ -10,7 +10,7 @@ static struct lock_class_key lowpan_netdev_xmit_lock_key; static void lowpan_set_lockdep_class_one(struct net_device *dev, -@@ -459,7 +461,9 @@ static void lowpan_set_lockdep_class_one +@@ -457,7 +459,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); -- cgit v1.2.3