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

Phonet: allocate separate ARP type for GPRS over a Phonet pipe 



A separate xmit lock class supports GPRS over a Phonet pipe over a TUN
device (type ARPHRD_NONE).

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

include/linux/if_arp.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */



#define ARPHRD_PHONET	820		/* PhoNet media type		*/

#define ARPHRD_PHONET_PIPE 821		/* PhoNet pipe header		*/



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

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

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ 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_VOID, ARPHRD_NONE};

	 ARPHRD_PHONET_PIPE, ARPHRD_VOID, ARPHRD_NONE};



static const char *netdev_lock_name[] =

	{"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
@@ -301,7 +301,7 @@ 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_VOID", "_xmit_NONE"};

	 "_xmit_PHONET_PIPE", "_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/phonet/pep-gprs.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int gprs_set_mtu(struct net_device *dev, int new_mtu) 
static void gprs_setup(struct net_device *dev)

{

	dev->features		= NETIF_F_FRAGLIST;

	dev->type		= ARPHRD_NONE;

	dev->type		= ARPHRD_PHONET_PIPE;

	dev->flags		= IFF_POINTOPOINT | IFF_NOARP;

	dev->mtu		= GPRS_DEFAULT_MTU;

	dev->hard_header_len	= 0;