Commit 929122cd authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov
Browse files

Drop ARPHRD_IEEE802154_PHY 



There are not maste devices in mac802154 anymore, so drop
ARPHRD_IEEE802154_PHY definition.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
parent 16eea493

include/linux/if_arp.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#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		*/

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -269,7 +269,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_PHONET_PIPE, ARPHRD_IEEE802154, ARPHRD_IEEE802154_PHY,

	 ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154,

	 ARPHRD_VOID, ARPHRD_NONE};



static const char *const netdev_lock_name[] =
@@ -287,7 +287,7 @@ static const char *const 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_IEEE802154", "_xmit_IEEE802154_PHY",

	 "_xmit_PHONET_PIPE", "_xmit_IEEE802154",

	 "_xmit_VOID", "_xmit_NONE"};



static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)];

net/ieee802154/af_ieee802154.c

+1 −3
Original line number Diff line number Diff line
@@ -147,9 +147,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg, 
	dev_load(sock_net(sk), ifr.ifr_name);

	dev = dev_get_by_name(sock_net(sk), ifr.ifr_name);



	if ((dev->type == ARPHRD_IEEE802154 ||

	     dev->type == ARPHRD_IEEE802154_PHY) &&

	    dev->netdev_ops->ndo_do_ioctl)

	if (dev->type == ARPHRD_IEEE802154 && dev->netdev_ops->ndo_do_ioctl)

		ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, cmd);



	if (!ret && copy_to_user(arg, &ifr, sizeof(struct ifreq)))

net/ieee802154/raw.c

+1 −2
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int len) 
		goto out;

	}



	if (dev->type != ARPHRD_IEEE802154_PHY &&

	    dev->type != ARPHRD_IEEE802154) {

	if (dev->type != ARPHRD_IEEE802154) {

		err = -ENODEV;

		goto out_put;

	}