diff options
| author | AceLan Kao <acelan.kao@canonical.com> | 2017-08-08 21:14:51 +0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-06 16:53:12 +0200 |
| commit | 450ac626337307a5870000e9751a3ad3da2fd813 (patch) | |
| tree | 1af808ad4315da04f40794682f17883320d2480f /patches/0006-ieee802154-6lowpan-namespace.patch | |
| parent | e2b55245cfcb9a54fa7de357309a65205615f7d3 (diff) | |
backports: remove 802.15.4 entirely
802.15.4 has been removed by this commit,
15a3df8 backports: remove 802.15.4 entirely
but there are some files left behind.
Remove them all.
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0006-ieee802154-6lowpan-namespace.patch')
| -rw-r--r-- | patches/0006-ieee802154-6lowpan-namespace.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/patches/0006-ieee802154-6lowpan-namespace.patch b/patches/0006-ieee802154-6lowpan-namespace.patch deleted file mode 100644 index 2412a450..00000000 --- a/patches/0006-ieee802154-6lowpan-namespace.patch +++ /dev/null @@ -1,63 +0,0 @@ -This is required unless we add some macro wrappers for this -type of static work upstream but not sure if that is a good -idea yet. - ---- a/net/ieee802154/reassembly.c -+++ b/net/ieee802154/reassembly.c -@@ -97,7 +97,11 @@ static void lowpan_frag_expire(unsigned - struct net *net; - - fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q); -+#if LINUX_VERSION_IS_GEQ(3,15,0) - net = container_of(fq->q.net, struct net, ieee802154_lowpan.frags); -+#else -+ net = &init_net; -+#endif - - spin_lock(&fq->q.lock); - -@@ -395,24 +399,44 @@ static int zero; - static struct ctl_table lowpan_frags_ns_ctl_table[] = { - { - .procname = "6lowpanfrag_high_thresh", -+#if LINUX_VERSION_IS_GEQ(3,15,0) - .data = &init_net.ieee802154_lowpan.frags.high_thresh, -+#else -+ .data = &ieee802154_lowpan.frags.high_thresh, -+#endif - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, -+#if LINUX_VERSION_IS_GEQ(3,15,0) - .extra1 = &init_net.ieee802154_lowpan.frags.low_thresh -+#else -+ .extra1 = &ieee802154_lowpan.frags.low_thresh -+#endif - }, - { - .procname = "6lowpanfrag_low_thresh", -+#if LINUX_VERSION_IS_GEQ(3,15,0) - .data = &init_net.ieee802154_lowpan.frags.low_thresh, -+#else -+ .data = &ieee802154_lowpan.frags.low_thresh, -+#endif - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, -+#if LINUX_VERSION_IS_GEQ(3,15,0) - .extra2 = &init_net.ieee802154_lowpan.frags.high_thresh -+#else -+ .extra2 = &ieee802154_lowpan.frags.high_thresh -+#endif - }, - { - .procname = "6lowpanfrag_time", -+#if LINUX_VERSION_IS_GEQ(3,15,0) - .data = &init_net.ieee802154_lowpan.frags.timeout, -+#else -+ .data = &ieee802154_lowpan.frags.timeout, -+#endif - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, |