Commit 2d91d78b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller
Browse files

Phonet: allocate a non-Ethernet ARP type 



Also leave some room for more 802.11 types.

Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc10af8e

include/linux/if_arp.h

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ 
#define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */

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



#define ARPHRD_PHONET	820		/* PhoNet media type		*/



#define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known */

#define ARPHRD_NONE	  0xFFFE	/* zero header length */

net/core/dev.c

+4 −4
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ static const unsigned short netdev_lock_type[] = 
	 ARPHRD_PIMREG, ARPHRD_HIPPI, ARPHRD_ASH, ARPHRD_ECONET,

	 ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL,

	 ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211,

	 ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_VOID,

	 ARPHRD_NONE};

	 ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET,

	 ARPHRD_VOID, ARPHRD_NONE};



static const char *netdev_lock_name[] =

	{"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
@@ -300,8 +300,8 @@ static const char *netdev_lock_name[] = 
	 "_xmit_PIMREG", "_xmit_HIPPI", "_xmit_ASH", "_xmit_ECONET",

	 "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL",

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

	 "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_VOID",

	 "_xmit_NONE"};

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

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