diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-05 22:56:09 +0000 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-08 18:16:22 -0700 |
commit | 31bc2b35602cdf27b68f5dccbd450023faa44e56 (patch) | |
tree | 4bfe331cbc63e6ff20b1f5c6c12c72e0c72a6943 /patches/0000-upstream-backport-changes | |
parent | c921dc658c78ec3dc1c479afe19a1c57b4e12eca (diff) |
backports: refresh patches for next-20140320backports-20140320
The wil6210 driver gets NETIF_F_GRO but not that we haven't
been backporting this feature, which was added as of v2.6.29
via commit d565b0a1a. The driver is only enabled on the
dependencies file down to 2.6.31 though so we simply reuse the
check against kernels >= 2.6.39 to use the netdev->hw_features.
mcgrof@ergon ~/linux-next (git::master)$ git describe --contains d565b0a1a
v2.6.29-rc1~581^2~181
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean
--refresh /home/mcgrof/linux-next /home/mcgrof/build/next-20140320
Copy original source files ...
Apply patches ...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!
real 1m59.391s
user 19m26.468s
sys 0m45.128s
mcgrof@drvbp1 ~/build/next-20140320 $ time ckmake --allyesconfig
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.79 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.29 [ OK ]
27 3.11.10 [ OK ]
28 3.12.10 [ OK ]
29 3.13.2 [ OK ]
30 3.14-rc1 [ OK ]
real 36m11.856s
user 994m29.360s
sys 124m49.936s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/0000-upstream-backport-changes')
-rw-r--r-- | patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch b/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch index a49ea021..6205752e 100644 --- a/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch +++ b/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch @@ -14,15 +14,9 @@ with no code changes. Cc:Alexander Aring <alex.aring@gmail.com> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> ---- -diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c -index f4ac957..0bcbef3 100644 --- -1.9.0 - --- a/net/ieee802154/reassembly.c +++ b/net/ieee802154/reassembly.c -@@ -116,6 +116,8 @@ fq_find(struct net *net, const struct ie +@@ -120,6 +120,8 @@ fq_find(struct net *net, const struct lo struct inet_frag_queue *q; struct lowpan_create_arg arg; unsigned int hash; @@ -31,7 +25,7 @@ index f4ac957..0bcbef3 100644 arg.tag = frag_info->d_tag; arg.d_size = frag_info->d_size; -@@ -125,7 +127,7 @@ fq_find(struct net *net, const struct ie +@@ -129,7 +131,7 @@ fq_find(struct net *net, const struct lo read_lock(&lowpan_frags.lock); hash = lowpan_hash_frag(frag_info->d_tag, frag_info->d_size, src, dst); @@ -40,15 +34,16 @@ index f4ac957..0bcbef3 100644 &lowpan_frags, &arg, hash); if (IS_ERR_OR_NULL(q)) { inet_frag_maybe_warn_overflow(q, pr_fmt()); -@@ -354,16 +356,18 @@ int lowpan_frag_rcv(struct sk_buff *skb, - struct lowpan_frag_queue *fq; +@@ -357,6 +359,8 @@ int lowpan_frag_rcv(struct sk_buff *skb, struct net *net = dev_net(skb->dev); - struct ieee802154_frag_info *frag_info = &mac_cb(skb)->frag_info; + struct lowpan_frag_info *frag_info = lowpan_cb(skb); + struct ieee802154_addr source, dest; + struct netns_ieee802154_lowpan *ieee802154_lowpan = + net_ieee802154_lowpan(net); int err; - err = lowpan_get_frag_info(skb, frag_type, frag_info); + source = mac_cb(skb)->source; +@@ -366,10 +370,10 @@ int lowpan_frag_rcv(struct sk_buff *skb, if (err < 0) goto err; @@ -59,9 +54,9 @@ index f4ac957..0bcbef3 100644 - inet_frag_evictor(&net->ieee802154_lowpan.frags, &lowpan_frags, false); + inet_frag_evictor(&ieee802154_lowpan->frags, &lowpan_frags, false); - fq = fq_find(net, frag_info, &mac_cb(skb)->sa, &mac_cb(skb)->da); + fq = fq_find(net, frag_info, &source, &dest); if (fq != NULL) { -@@ -430,6 +434,8 @@ static int __net_init lowpan_frags_ns_sy +@@ -436,6 +440,8 @@ static int __net_init lowpan_frags_ns_sy { struct ctl_table *table; struct ctl_table_header *hdr; @@ -70,7 +65,7 @@ index f4ac957..0bcbef3 100644 table = lowpan_frags_ns_ctl_table; if (!net_eq(net, &init_net)) { -@@ -438,10 +444,10 @@ static int __net_init lowpan_frags_ns_sy +@@ -444,10 +450,10 @@ static int __net_init lowpan_frags_ns_sy if (table == NULL) goto err_alloc; @@ -85,7 +80,7 @@ index f4ac957..0bcbef3 100644 /* Don't export sysctls to unprivileged users */ if (net->user_ns != &init_user_ns) -@@ -452,7 +458,7 @@ static int __net_init lowpan_frags_ns_sy +@@ -458,7 +464,7 @@ static int __net_init lowpan_frags_ns_sy if (hdr == NULL) goto err_reg; @@ -94,7 +89,7 @@ index f4ac957..0bcbef3 100644 return 0; err_reg: -@@ -465,9 +471,11 @@ err_alloc: +@@ -471,9 +477,11 @@ err_alloc: static void __net_exit lowpan_frags_ns_sysctl_unregister(struct net *net) { struct ctl_table *table; @@ -108,7 +103,7 @@ index f4ac957..0bcbef3 100644 if (!net_eq(net, &init_net)) kfree(table); } -@@ -508,20 +516,26 @@ static inline void lowpan_frags_sysctl_u +@@ -514,20 +522,26 @@ static inline void lowpan_frags_sysctl_u static int __net_init lowpan_frags_init_net(struct net *net) { |