diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-03-29 22:09:57 +0000 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-08 18:16:21 -0700 |
commit | ae919302cc8c1c93a1f1b8b7e086abfe13771286 (patch) | |
tree | 97430c31a96601786ac27d7fb4920bf3b0f40633 /patches/0000-upstream-backport-changes | |
parent | 8680eb1be12f4121fa4a49cbf6b4e043cdbb1c73 (diff) |
backports: refresh patches based on next-20140311backports-20140311
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 ]
Generation time:
real 1m32.523s
user 23m51.796s
sys 0m28.872s
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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch b/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch index 2f88b288..a49ea021 100644 --- a/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch +++ b/patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch @@ -22,7 +22,7 @@ index f4ac957..0bcbef3 100644 --- a/net/ieee802154/reassembly.c +++ b/net/ieee802154/reassembly.c -@@ -123,6 +123,8 @@ fq_find(struct net *net, const struct ie +@@ -116,6 +116,8 @@ fq_find(struct net *net, const struct ie struct inet_frag_queue *q; struct lowpan_create_arg arg; unsigned int hash; @@ -31,7 +31,7 @@ index f4ac957..0bcbef3 100644 arg.tag = frag_info->d_tag; arg.d_size = frag_info->d_size; -@@ -132,7 +134,7 @@ fq_find(struct net *net, const struct ie +@@ -125,7 +127,7 @@ fq_find(struct net *net, const struct ie read_lock(&lowpan_frags.lock); hash = lowpan_hash_frag(frag_info->d_tag, frag_info->d_size, src, dst); @@ -40,7 +40,7 @@ index f4ac957..0bcbef3 100644 &lowpan_frags, &arg, hash); if (IS_ERR_OR_NULL(q)) { inet_frag_maybe_warn_overflow(q, pr_fmt()); -@@ -361,16 +363,18 @@ int lowpan_frag_rcv(struct sk_buff *skb, +@@ -354,16 +356,18 @@ int lowpan_frag_rcv(struct sk_buff *skb, struct lowpan_frag_queue *fq; struct net *net = dev_net(skb->dev); struct ieee802154_frag_info *frag_info = &mac_cb(skb)->frag_info; @@ -61,7 +61,7 @@ index f4ac957..0bcbef3 100644 fq = fq_find(net, frag_info, &mac_cb(skb)->sa, &mac_cb(skb)->da); if (fq != NULL) { -@@ -453,6 +457,8 @@ static int __net_init lowpan_frags_ns_sy +@@ -430,6 +434,8 @@ static int __net_init lowpan_frags_ns_sy { struct ctl_table *table; struct ctl_table_header *hdr; @@ -70,7 +70,7 @@ index f4ac957..0bcbef3 100644 table = lowpan_frags_ns_ctl_table; if (!net_eq(net, &init_net)) { -@@ -461,10 +467,10 @@ static int __net_init lowpan_frags_ns_sy +@@ -438,10 +444,10 @@ static int __net_init lowpan_frags_ns_sy if (table == NULL) goto err_alloc; @@ -85,7 +85,7 @@ index f4ac957..0bcbef3 100644 /* Don't export sysctls to unprivileged users */ if (net->user_ns != &init_user_ns) -@@ -475,7 +481,7 @@ static int __net_init lowpan_frags_ns_sy +@@ -452,7 +458,7 @@ static int __net_init lowpan_frags_ns_sy if (hdr == NULL) goto err_reg; @@ -94,7 +94,7 @@ index f4ac957..0bcbef3 100644 return 0; err_reg: -@@ -488,9 +494,11 @@ err_alloc: +@@ -465,9 +471,11 @@ err_alloc: static void __net_exit lowpan_frags_ns_sysctl_unregister(struct net *net) { struct ctl_table *table; @@ -108,7 +108,7 @@ index f4ac957..0bcbef3 100644 if (!net_eq(net, &init_net)) kfree(table); } -@@ -531,20 +539,26 @@ static inline void lowpan_frags_sysctl_u +@@ -508,20 +516,26 @@ static inline void lowpan_frags_sysctl_u static int __net_init lowpan_frags_init_net(struct net *net) { |