Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcb94e42 authored by Sergey Lapin's avatar Sergey Lapin Committed by David S. Miller
Browse files

Add constants for the ieee 802.15.4 stack 



IEEE 802.15.4 stack requires several constants to be defined/adjusted.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarSergey Lapin <slapin@ossfans.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4a710c4

include/linux/if_arp.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ 
#define ARPHRD_IEEE80211 801		/* IEEE 802.11			*/

#define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */

#define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */

#define ARPHRD_IEEE802154	  804

#define ARPHRD_IEEE802154_PHY	  805



#define ARPHRD_PHONET	820		/* PhoNet media type		*/

#define ARPHRD_PHONET_PIPE 821		/* PhoNet pipe header		*/

include/linux/if_ether.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#define ETH_P_DSA	0x001B		/* Distributed Switch Arch.	*/

#define ETH_P_TRAILER	0x001C		/* Trailer switch tagging	*/

#define ETH_P_PHONET	0x00F5		/* Nokia Phonet frames          */

#define ETH_P_IEEE802154 0x00F6		/* IEEE802.15.4 frame		*/



/*

 *	This is an Ethernet frame header.

include/linux/socket.h

+3 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ struct ucred { 
#define AF_RXRPC	33	/* RxRPC sockets 		*/

#define AF_ISDN		34	/* mISDN sockets 		*/

#define AF_PHONET	35	/* Phonet sockets		*/

#define AF_MAX		36	/* For now.. */

#define AF_IEEE802154	36	/* IEEE802154 sockets		*/

#define AF_MAX		37	/* For now.. */



/* Protocol families, same as address families. */

#define PF_UNSPEC	AF_UNSPEC
@@ -233,6 +234,7 @@ struct ucred { 
#define PF_RXRPC	AF_RXRPC

#define PF_ISDN		AF_ISDN

#define PF_PHONET	AF_PHONET

#define PF_IEEE802154	AF_IEEE802154

#define PF_MAX		AF_MAX



/* Maximum queue length specifiable by listen.  */

net/core/dev.c

+4 −2
Original line number Diff line number Diff line
@@ -269,7 +269,8 @@ static const unsigned short netdev_lock_type[] = 
	 ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL,

	 ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211,

	 ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET,

	 ARPHRD_PHONET_PIPE, ARPHRD_VOID, ARPHRD_NONE};

	 ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154, ARPHRD_IEEE802154_PHY,

	 ARPHRD_VOID, ARPHRD_NONE};



static const char *netdev_lock_name[] =

	{"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
@@ -286,7 +287,8 @@ static const char *netdev_lock_name[] = 
	 "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL",

	 "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211",

	 "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET",

	 "_xmit_PHONET_PIPE", "_xmit_VOID", "_xmit_NONE"};

	 "_xmit_PHONET_PIPE", "_xmit_IEEE802154", "_xmit_IEEE802154_PHY",

	 "_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)];

net/core/sock.c

+3 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static const char *af_family_key_strings[AF_MAX+1] = { 
  "sk_lock-27"       , "sk_lock-28"          , "sk_lock-AF_CAN"      ,

  "sk_lock-AF_TIPC"  , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV"        ,

  "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN"     , "sk_lock-AF_PHONET"   ,

  "sk_lock-AF_IEEE802154",

  "sk_lock-AF_MAX"

};

static const char *af_family_slock_key_strings[AF_MAX+1] = {
@@ -170,6 +171,7 @@ static const char *af_family_slock_key_strings[AF_MAX+1] = { 
  "slock-27"       , "slock-28"          , "slock-AF_CAN"      ,

  "slock-AF_TIPC"  , "slock-AF_BLUETOOTH", "slock-AF_IUCV"     ,

  "slock-AF_RXRPC" , "slock-AF_ISDN"     , "slock-AF_PHONET"   ,

  "slock-AF_IEEE802154",

  "slock-AF_MAX"

};

static const char *af_family_clock_key_strings[AF_MAX+1] = {
@@ -185,6 +187,7 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = { 
  "clock-27"       , "clock-28"          , "clock-AF_CAN"      ,

  "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,

  "clock-AF_RXRPC" , "clock-AF_ISDN"     , "clock-AF_PHONET"   ,

  "clock-AF_IEEE802154",

  "clock-AF_MAX"

};