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/0068-proto-hash/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/0068-proto-hash/ieee802154.patch')
| -rw-r--r-- | patches/0068-proto-hash/ieee802154.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/patches/0068-proto-hash/ieee802154.patch b/patches/0068-proto-hash/ieee802154.patch deleted file mode 100644 index 9b5a9712..00000000 --- a/patches/0068-proto-hash/ieee802154.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c -index e0bd013..9e78921 100644 ---- a/net/ieee802154/socket.c -+++ b/net/ieee802154/socket.c -@@ -182,14 +182,20 @@ static int ieee802154_sock_ioctl(struct - static HLIST_HEAD(raw_head); - static DEFINE_RWLOCK(raw_lock); - -+#if LINUX_VERSION_IS_GEQ(4,6,0) - static int raw_hash(struct sock *sk) -+#else -+static void raw_hash(struct sock *sk) -+#endif - { - write_lock_bh(&raw_lock); - sk_add_node(sk, &raw_head); - sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); - write_unlock_bh(&raw_lock); - -+#if LINUX_VERSION_IS_GEQ(4,6,0) - return 0; -+#endif - } - - static void raw_unhash(struct sock *sk) -@@ -464,14 +470,20 @@ static inline struct dgram_sock *dgram_s - return container_of(sk, struct dgram_sock, sk); - } - -+#if LINUX_VERSION_IS_GEQ(4,6,0) - static int dgram_hash(struct sock *sk) -+#else -+static void dgram_hash(struct sock *sk) -+#endif - { - write_lock_bh(&dgram_lock); - sk_add_node(sk, &dgram_head); - sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); - write_unlock_bh(&dgram_lock); - -+#if LINUX_VERSION_IS_GEQ(4,6,0) - return 0; -+#endif - } - - static void dgram_unhash(struct sock *sk) -@@ -1031,11 +1043,15 @@ static int ieee802154_create(struct net - sock_set_flag(sk, SOCK_ZAPPED); - - if (sk->sk_prot->hash) { -+#if LINUX_VERSION_IS_GEQ(4,6,0) - rc = sk->sk_prot->hash(sk); - if (rc) { - sk_common_release(sk); - goto out; - } -+#else -+ sk->sk_prot->hash(sk); -+#endif - } - - if (sk->sk_prot->init) { |