lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop ARPHRD_IEEE802154_PHY

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

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
This commit is contained in:
Dmitry Eremin-Solenikov
2009-08-14 20:00:20 +04:00
parent 16eea493da
commit 929122cdd5
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ieee802154/af_ieee802154.c
View File

@@ -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)))

3
net/ieee802154/raw.c
View File

@@ -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;
}