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/0044-no_user_ns_in_net/ieee802154.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/0044-no_user_ns_in_net/ieee802154.patch')
| -rw-r--r-- | patches/0044-no_user_ns_in_net/ieee802154.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/patches/0044-no_user_ns_in_net/ieee802154.patch b/patches/0044-no_user_ns_in_net/ieee802154.patch deleted file mode 100644 index 6c3cd210..00000000 --- a/patches/0044-no_user_ns_in_net/ieee802154.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/net/ieee802154/dgram.c -+++ b/net/ieee802154/dgram.c -@@ -480,8 +480,13 @@ static int dgram_setsockopt(struct sock - ro->want_ack = !!val; - break; - case WPAN_SECURITY: -+#if LINUX_VERSION_IS_GEQ(3,8,0) - if (!ns_capable(net->user_ns, CAP_NET_ADMIN) && - !ns_capable(net->user_ns, CAP_NET_RAW)) { -+#else -+ if (!capable(CAP_NET_ADMIN) && -+ !capable(CAP_NET_RAW)) { -+#endif - err = -EPERM; - break; - } -@@ -504,8 +509,13 @@ static int dgram_setsockopt(struct sock - } - break; - case WPAN_SECURITY_LEVEL: -+#if LINUX_VERSION_IS_GEQ(3,8,0) - if (!ns_capable(net->user_ns, CAP_NET_ADMIN) && - !ns_capable(net->user_ns, CAP_NET_RAW)) { -+#else -+ if (!capable(CAP_NET_ADMIN) && -+ !capable(CAP_NET_RAW)) { -+#endif - err = -EPERM; - break; - } |