From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A64C7C433F4 for ; Sun, 23 Sep 2018 16:06:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D69E208A3 for ; Sun, 23 Sep 2018 16:06:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D69E208A3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726440AbeIWWEL (ORCPT ); Sun, 23 Sep 2018 18:04:11 -0400 Received: from mx2.suse.de ([195.135.220.15]:41384 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726094AbeIWWEL (ORCPT ); Sun, 23 Sep 2018 18:04:11 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DAE08AD68; Sun, 23 Sep 2018 16:06:10 +0000 (UTC) Subject: Re: [RFC 2/3 net] lorawan: Add macro and definition for LoRaWAN class modlue To: Jian-Hong Pan References: Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jiri Pirko , Marcel Holtmann , "David S. Miller" , Matthias Brugger , Janus Piwek , =?UTF-8?Q?Michael_R=c3=b6der?= , Dollar Chen , Ken Yu , =?UTF-8?Q?Konstantin_B=c3=b6hm?= , Jan Jongboom , Jon Ortego , "contact@snootlab.com" , Ben Whitten , Brian Ray , lora@globalsat.com.tw, Alexander Graf , =?UTF-8?Q?Michal_Kube=c4=8dek?= , Rob Herring , devicetree@vger.kernel.org, Steve deRosier , Mark Brown , linux-spi@vger.kernel.org, Pieter ROBYNS , Hasnain Virk , linux-wpan - ML , Stefan Schmidt , Daniele Comel , shess@hessware.de, Xue Liu , fomi From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Openpgp: preference=signencrypt Autocrypt: addr=afaerber@suse.de; prefer-encrypt=mutual; keydata= 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 Organization: SUSE Linux GmbH Message-ID: Date: Sun, 23 Sep 2018 18:06:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jian-Hong, Many thanks and sorry for the delay. This patch mostly looks good and should go in before its first uses, so I would like to queue it soon for my hardware-MAC module drivers - but some questions below. Also a typo in the subject, and we should probably prepend "net: " and I would personally not mention the module here as it's a userspace API. Am 23.08.18 um 19:15 schrieb Jian-Hong Pan: > This patch add the macro and definition for the implementation of > LoRaWAN protocol. I would fix up the grammar nits in my tree then. > > Signed-off-by: Jian-Hong Pan > --- > include/linux/socket.h | 5 ++++- > include/uapi/linux/if_arp.h | 1 + > include/uapi/linux/if_ether.h | 1 + > net/core/dev.c | 4 ++-- > security/selinux/hooks.c | 4 +++- > security/selinux/include/classmap.h | 4 +++- > 6 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/include/linux/socket.h b/include/linux/socket.h > index aa1e288b1659..e5c8381fd1aa 100644 > --- a/include/linux/socket.h > +++ b/include/linux/socket.h > @@ -209,8 +209,9 @@ struct ucred { > */ > #define AF_XDP 44 /* XDP sockets */ > #define AF_LORA 45 /* LoRa sockets */ > +#define AF_LORAWAN 46 /* LoRaWAN sockets */ > > -#define AF_MAX 46 /* For now.. */ > +#define AF_MAX 47 /* For now.. */ > > /* Protocol families, same as address families. */ > #define PF_UNSPEC AF_UNSPEC > @@ -261,6 +262,7 @@ struct ucred { > #define PF_SMC AF_SMC > #define PF_XDP AF_XDP > #define PF_LORA AF_LORA > +#define PF_LORAWAN AF_LORAWAN > #define PF_MAX AF_MAX > > /* Maximum queue length specifiable by listen. */ > @@ -343,6 +345,7 @@ struct ucred { > #define SOL_KCM 281 > #define SOL_TLS 282 > #define SOL_XDP 283 > +#define SOL_LORAWAN 284 > > /* IPX options */ > #define IPX_TYPE 1 > diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h > index 1ed7cb3f2129..2376f7839355 100644 > --- a/include/uapi/linux/if_arp.h > +++ b/include/uapi/linux/if_arp.h > @@ -99,6 +99,7 @@ > #define ARPHRD_6LOWPAN 825 /* IPv6 over LoWPAN */ > #define ARPHRD_VSOCKMON 826 /* Vsock monitor header */ > #define ARPHRD_LORA 827 /* LoRa */ > +#define ARPHRD_LORAWAN 828 /* LoRaWAN */ > > #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */ > #define ARPHRD_NONE 0xFFFE /* zero header length */ > diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h > index 45644dcf5b39..b1ac70d4a377 100644 > --- a/include/uapi/linux/if_ether.h > +++ b/include/uapi/linux/if_ether.h > @@ -148,6 +148,7 @@ > * aggregation protocol > */ > #define ETH_P_LORA 0x00FA /* LoRa */ > +#define ETH_P_LORAWAN 0x00FB /* LoRaWAN */ > > /* > * This is an Ethernet frame header. > diff --git a/net/core/dev.c b/net/core/dev.c > index f68122f0ab02..b95ce79ec5a8 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -297,7 +297,7 @@ static const unsigned short netdev_lock_type[] = { > ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, > ARPHRD_FCFABRIC, ARPHRD_IEEE80211, ARPHRD_IEEE80211_PRISM, > ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, ARPHRD_PHONET_PIPE, > - ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE}; > + ARPHRD_IEEE802154, ARPHRD_LORAWAN, ARPHRD_VOID, ARPHRD_NONE}; > > static const char *const netdev_lock_name[] = { > "_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", > @@ -314,7 +314,7 @@ static const char *const netdev_lock_name[] = { > "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", > "_xmit_FCFABRIC", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM", > "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", "_xmit_PHONET_PIPE", > - "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"}; > + "_xmit_IEEE802154", "_xmit_LORAWAN", "_xmit_VOID", "_xmit_NONE"}; > > static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; > static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; All your new constants except SOL_LORAWAN are always next to a LoRa one, but not in these two arrays. I don't have such changes in my original LoRa patch - am I missing such an array extension for ARPHRD_LORA then, or what is the criteria for when to add this? Other changes look fine to me. Regards, Andreas > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index aaf520a689d8..0da3a1d69cb8 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -1477,7 +1477,9 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc > return SECCLASS_XDP_SOCKET; > case PF_LORA: > return SECCLASS_LORA_SOCKET; > -#if PF_MAX > 46 > + case PF_LORAWAN: > + return SECCLASS_LORAWAN_SOCKET; > +#if PF_MAX > 47 > #error New address family defined, please update this function. > #endif > } > diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h > index 060d4bf8385e..fa0151fe6f32 100644 > --- a/security/selinux/include/classmap.h > +++ b/security/selinux/include/classmap.h > @@ -244,9 +244,11 @@ struct security_class_mapping secclass_map[] = { > { COMMON_SOCK_PERMS, NULL } }, > { "lora_socket", > { COMMON_SOCK_PERMS, NULL } }, > + { "lorawan_socket", > + { COMMON_SOCK_PERMS, NULL } }, > { NULL } > }; > > -#if PF_MAX > 46 > +#if PF_MAX > 47 > #error New address family defined, please update secclass_map. > #endif > -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Subject: Re: [RFC 2/3 net] lorawan: Add macro and definition for LoRaWAN class modlue Date: Sun, 23 Sep 2018 18:06:03 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jiri Pirko , Marcel Holtmann , "David S. Miller" , Matthias Brugger , Janus Piwek , =?UTF-8?Q?Michael_R=c3=b6der?= , Dollar Chen , Ken Yu , =?UTF-8?Q?Konstantin_B=c3=b6hm?= , Jan Jongboom , Jon Ortego , "contact@snootlab.com" , Ben Whitten , Brian Ray , lora@globalsat.com.tw, Alexander Graf , =?UTF-8?Q?Michal_Kube=c4=8dek?= Return-path: Received: from mx2.suse.de ([195.135.220.15]:41384 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726094AbeIWWEL (ORCPT ); Sun, 23 Sep 2018 18:04:11 -0400 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: Hi Jian-Hong, Many thanks and sorry for the delay. This patch mostly looks good and should go in before its first uses, so I would like to queue it soon for my hardware-MAC module drivers - but some questions below. Also a typo in the subject, and we should probably prepend "net: " and I would personally not mention the module here as it's a userspace API. Am 23.08.18 um 19:15 schrieb Jian-Hong Pan: > This patch add the macro and definition for the implementation of > LoRaWAN protocol. I would fix up the grammar nits in my tree then. > > Signed-off-by: Jian-Hong Pan > --- > include/linux/socket.h | 5 ++++- > include/uapi/linux/if_arp.h | 1 + > include/uapi/linux/if_ether.h | 1 + > net/core/dev.c | 4 ++-- > security/selinux/hooks.c | 4 +++- > security/selinux/include/classmap.h | 4 +++- > 6 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/include/linux/socket.h b/include/linux/socket.h > index aa1e288b1659..e5c8381fd1aa 100644 > --- a/include/linux/socket.h > +++ b/include/linux/socket.h > @@ -209,8 +209,9 @@ struct ucred { > */ > #define AF_XDP 44 /* XDP sockets */ > #define AF_LORA 45 /* LoRa sockets */ > +#define AF_LORAWAN 46 /* LoRaWAN sockets */ > > -#define AF_MAX 46 /* For now.. */ > +#define AF_MAX 47 /* For now.. */ > > /* Protocol families, same as address families. */ > #define PF_UNSPEC AF_UNSPEC > @@ -261,6 +262,7 @@ struct ucred { > #define PF_SMC AF_SMC > #define PF_XDP AF_XDP > #define PF_LORA AF_LORA > +#define PF_LORAWAN AF_LORAWAN > #define PF_MAX AF_MAX > > /* Maximum queue length specifiable by listen. */ > @@ -343,6 +345,7 @@ struct ucred { > #define SOL_KCM 281 > #define SOL_TLS 282 > #define SOL_XDP 283 > +#define SOL_LORAWAN 284 > > /* IPX options */ > #define IPX_TYPE 1 > diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h > index 1ed7cb3f2129..2376f7839355 100644 > --- a/include/uapi/linux/if_arp.h > +++ b/include/uapi/linux/if_arp.h > @@ -99,6 +99,7 @@ > #define ARPHRD_6LOWPAN 825 /* IPv6 over LoWPAN */ > #define ARPHRD_VSOCKMON 826 /* Vsock monitor header */ > #define ARPHRD_LORA 827 /* LoRa */ > +#define ARPHRD_LORAWAN 828 /* LoRaWAN */ > > #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */ > #define ARPHRD_NONE 0xFFFE /* zero header length */ > diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h > index 45644dcf5b39..b1ac70d4a377 100644 > --- a/include/uapi/linux/if_ether.h > +++ b/include/uapi/linux/if_ether.h > @@ -148,6 +148,7 @@ > * aggregation protocol > */ > #define ETH_P_LORA 0x00FA /* LoRa */ > +#define ETH_P_LORAWAN 0x00FB /* LoRaWAN */ > > /* > * This is an Ethernet frame header. > diff --git a/net/core/dev.c b/net/core/dev.c > index f68122f0ab02..b95ce79ec5a8 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -297,7 +297,7 @@ static const unsigned short netdev_lock_type[] = { > ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, > ARPHRD_FCFABRIC, ARPHRD_IEEE80211, ARPHRD_IEEE80211_PRISM, > ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, ARPHRD_PHONET_PIPE, > - ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE}; > + ARPHRD_IEEE802154, ARPHRD_LORAWAN, ARPHRD_VOID, ARPHRD_NONE}; > > static const char *const netdev_lock_name[] = { > "_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", > @@ -314,7 +314,7 @@ static const char *const netdev_lock_name[] = { > "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", > "_xmit_FCFABRIC", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM", > "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", "_xmit_PHONET_PIPE", > - "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"}; > + "_xmit_IEEE802154", "_xmit_LORAWAN", "_xmit_VOID", "_xmit_NONE"}; > > static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; > static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; All your new constants except SOL_LORAWAN are always next to a LoRa one, but not in these two arrays. I don't have such changes in my original LoRa patch - am I missing such an array extension for ARPHRD_LORA then, or what is the criteria for when to add this? Other changes look fine to me. Regards, Andreas > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index aaf520a689d8..0da3a1d69cb8 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -1477,7 +1477,9 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc > return SECCLASS_XDP_SOCKET; > case PF_LORA: > return SECCLASS_LORA_SOCKET; > -#if PF_MAX > 46 > + case PF_LORAWAN: > + return SECCLASS_LORAWAN_SOCKET; > +#if PF_MAX > 47 > #error New address family defined, please update this function. > #endif > } > diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h > index 060d4bf8385e..fa0151fe6f32 100644 > --- a/security/selinux/include/classmap.h > +++ b/security/selinux/include/classmap.h > @@ -244,9 +244,11 @@ struct security_class_mapping secclass_map[] = { > { COMMON_SOCK_PERMS, NULL } }, > { "lora_socket", > { COMMON_SOCK_PERMS, NULL } }, > + { "lorawan_socket", > + { COMMON_SOCK_PERMS, NULL } }, > { NULL } > }; > > -#if PF_MAX > 46 > +#if PF_MAX > 47 > #error New address family defined, please update secclass_map. > #endif > -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) From mboxrd@z Thu Jan 1 00:00:00 1970 From: afaerber@suse.de (=?UTF-8?Q?Andreas_F=c3=a4rber?=) Date: Sun, 23 Sep 2018 18:06:03 +0200 Subject: [RFC 2/3 net] lorawan: Add macro and definition for LoRaWAN class modlue In-Reply-To: References: Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Jian-Hong, Many thanks and sorry for the delay. This patch mostly looks good and should go in before its first uses, so I would like to queue it soon for my hardware-MAC module drivers - but some questions below. Also a typo in the subject, and we should probably prepend "net: " and I would personally not mention the module here as it's a userspace API. Am 23.08.18 um 19:15 schrieb Jian-Hong Pan: > This patch add the macro and definition for the implementation of > LoRaWAN protocol. I would fix up the grammar nits in my tree then. > > Signed-off-by: Jian-Hong Pan > --- > include/linux/socket.h | 5 ++++- > include/uapi/linux/if_arp.h | 1 + > include/uapi/linux/if_ether.h | 1 + > net/core/dev.c | 4 ++-- > security/selinux/hooks.c | 4 +++- > security/selinux/include/classmap.h | 4 +++- > 6 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/include/linux/socket.h b/include/linux/socket.h > index aa1e288b1659..e5c8381fd1aa 100644 > --- a/include/linux/socket.h > +++ b/include/linux/socket.h > @@ -209,8 +209,9 @@ struct ucred { > */ > #define AF_XDP 44 /* XDP sockets */ > #define AF_LORA 45 /* LoRa sockets */ > +#define AF_LORAWAN 46 /* LoRaWAN sockets */ > > -#define AF_MAX 46 /* For now.. */ > +#define AF_MAX 47 /* For now.. */ > > /* Protocol families, same as address families. */ > #define PF_UNSPEC AF_UNSPEC > @@ -261,6 +262,7 @@ struct ucred { > #define PF_SMC AF_SMC > #define PF_XDP AF_XDP > #define PF_LORA AF_LORA > +#define PF_LORAWAN AF_LORAWAN > #define PF_MAX AF_MAX > > /* Maximum queue length specifiable by listen. */ > @@ -343,6 +345,7 @@ struct ucred { > #define SOL_KCM 281 > #define SOL_TLS 282 > #define SOL_XDP 283 > +#define SOL_LORAWAN 284 > > /* IPX options */ > #define IPX_TYPE 1 > diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h > index 1ed7cb3f2129..2376f7839355 100644 > --- a/include/uapi/linux/if_arp.h > +++ b/include/uapi/linux/if_arp.h > @@ -99,6 +99,7 @@ > #define ARPHRD_6LOWPAN 825 /* IPv6 over LoWPAN */ > #define ARPHRD_VSOCKMON 826 /* Vsock monitor header */ > #define ARPHRD_LORA 827 /* LoRa */ > +#define ARPHRD_LORAWAN 828 /* LoRaWAN */ > > #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */ > #define ARPHRD_NONE 0xFFFE /* zero header length */ > diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h > index 45644dcf5b39..b1ac70d4a377 100644 > --- a/include/uapi/linux/if_ether.h > +++ b/include/uapi/linux/if_ether.h > @@ -148,6 +148,7 @@ > * aggregation protocol > */ > #define ETH_P_LORA 0x00FA /* LoRa */ > +#define ETH_P_LORAWAN 0x00FB /* LoRaWAN */ > > /* > * This is an Ethernet frame header. > diff --git a/net/core/dev.c b/net/core/dev.c > index f68122f0ab02..b95ce79ec5a8 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -297,7 +297,7 @@ static const unsigned short netdev_lock_type[] = { > ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, > ARPHRD_FCFABRIC, ARPHRD_IEEE80211, ARPHRD_IEEE80211_PRISM, > ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, ARPHRD_PHONET_PIPE, > - ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE}; > + ARPHRD_IEEE802154, ARPHRD_LORAWAN, ARPHRD_VOID, ARPHRD_NONE}; > > static const char *const netdev_lock_name[] = { > "_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", > @@ -314,7 +314,7 @@ static const char *const netdev_lock_name[] = { > "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", > "_xmit_FCFABRIC", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM", > "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", "_xmit_PHONET_PIPE", > - "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"}; > + "_xmit_IEEE802154", "_xmit_LORAWAN", "_xmit_VOID", "_xmit_NONE"}; > > static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; > static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; All your new constants except SOL_LORAWAN are always next to a LoRa one, but not in these two arrays. I don't have such changes in my original LoRa patch - am I missing such an array extension for ARPHRD_LORA then, or what is the criteria for when to add this? Other changes look fine to me. Regards, Andreas > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index aaf520a689d8..0da3a1d69cb8 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -1477,7 +1477,9 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc > return SECCLASS_XDP_SOCKET; > case PF_LORA: > return SECCLASS_LORA_SOCKET; > -#if PF_MAX > 46 > + case PF_LORAWAN: > + return SECCLASS_LORAWAN_SOCKET; > +#if PF_MAX > 47 > #error New address family defined, please update this function. > #endif > } > diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h > index 060d4bf8385e..fa0151fe6f32 100644 > --- a/security/selinux/include/classmap.h > +++ b/security/selinux/include/classmap.h > @@ -244,9 +244,11 @@ struct security_class_mapping secclass_map[] = { > { COMMON_SOCK_PERMS, NULL } }, > { "lora_socket", > { COMMON_SOCK_PERMS, NULL } }, > + { "lorawan_socket", > + { COMMON_SOCK_PERMS, NULL } }, > { NULL } > }; > > -#if PF_MAX > 46 > +#if PF_MAX > 47 > #error New address family defined, please update secclass_map. > #endif > -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany GF: Felix Imend?rffer, Jane Smithard, Graham Norton HRB 21284 (AG N?rnberg)