X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2Fieee802154%2Faf_ieee802154.c;h=cd949d5e451bb422fb11b7b6473acc3c38cb1aa7;hb=929122cdd5d4c344e59f9b55f870a8fcf7aa0d27;hp=d504c349cb0c73774b2a78143588f9e3c4b3c613;hpb=16eea493da563b5a3356a77c6d8776dffc29d3b6;p=safe%2Fjmp%2Flinux-2.6 diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index d504c34..cd949d5 100644 --- a/net/ieee802154/af_ieee802154.c +++ b/net/ieee802154/af_ieee802154.c @@ -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)))