summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0008-net-user-ns.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-25 14:04:49 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-25 15:35:43 +0200
commit2ced168dbd69b25809896c9f005b4143b2f66c44 (patch)
treeb822ed6c752e8d7e5dcab6bc5cbaf812e38e2d85 /patches/collateral-evolutions/network/0008-net-user-ns.patch
parent30b09ca89b286a349ff78b67a85b701c2db3613d (diff)
backports: refresh on v3.17.1v3.17.1-1linux-3.17.y
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 ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0008-net-user-ns.patch')
-rw-r--r--patches/collateral-evolutions/network/0008-net-user-ns.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0008-net-user-ns.patch b/patches/collateral-evolutions/network/0008-net-user-ns.patch
index d9cea85e..02ae368b 100644
--- a/patches/collateral-evolutions/network/0008-net-user-ns.patch
+++ b/patches/collateral-evolutions/network/0008-net-user-ns.patch
@@ -3,9 +3,9 @@ via commit 038e7332b8.
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
-@@ -491,9 +491,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;
- table[3].data = &ieee802154_lowpan->max_dsize;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
/* Don't export sysctls to unprivileged users */