diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-25 14:04:49 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-25 15:35:43 +0200 |
| commit | 2ced168dbd69b25809896c9f005b4143b2f66c44 (patch) | |
| tree | b822ed6c752e8d7e5dcab6bc5cbaf812e38e2d85 /patches/collateral-evolutions/network | |
| parent | 30b09ca89b286a349ff78b67a85b701c2db3613d (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')
3 files changed, 6 insertions, 17 deletions
diff --git a/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch b/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch index 609bf20f..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); -@@ -393,31 +397,55 @@ static int zero; +@@ -393,24 +397,44 @@ static int zero; static struct ctl_table lowpan_frags_ns_ctl_table[] = { { .procname = "6lowpanfrag_high_thresh", @@ -61,14 +61,3 @@ idea yet. .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_jiffies, - }, - { - .procname = "6lowpanfrag_max_datagram_size", -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) - .data = &init_net.ieee802154_lowpan.max_dsize, -+#else -+ .data = &ieee802154_lowpan.max_dsize, -+#endif - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec 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 */ diff --git a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch index 0565390e..c0ead910 100644 --- a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +++ b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch @@ -21,7 +21,7 @@ [NL80211_MCGRP_CONFIG] = { .name = "config", }, [NL80211_MCGRP_SCAN] = { .name = "scan", }, [NL80211_MCGRP_REGULATORY] = { .name = "regulatory", }, -@@ -9372,7 +9372,7 @@ static int nl80211_set_qos_map(struct sk +@@ -9378,7 +9378,7 @@ static int nl80211_set_qos_map(struct sk #define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\ NL80211_FLAG_CHECK_NETDEV_UP) @@ -30,7 +30,7 @@ struct genl_info *info) { struct cfg80211_registered_device *rdev; -@@ -9441,7 +9441,7 @@ static int nl80211_pre_doit(const struct +@@ -9447,7 +9447,7 @@ static int nl80211_pre_doit(const struct return 0; } @@ -39,7 +39,7 @@ struct genl_info *info) { if (info->user_ptr[1]) { -@@ -9458,7 +9458,7 @@ static void nl80211_post_doit(const stru +@@ -9464,7 +9464,7 @@ static void nl80211_post_doit(const stru rtnl_unlock(); } |