diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-08-02 14:12:01 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-08-06 12:49:17 +0400 |
| commit | 45a41d147a3a31bb218201b0dd70cfe4e9ed5105 (patch) | |
| tree | 3a5938a4c8bb04b5bbe2a80a41356e8008a7503f /net | |
| parent | 0bf52b981770cbf006323bab5177f2858a196766 (diff) | |
| download | linux-3.10-45a41d147a3a31bb218201b0dd70cfe4e9ed5105.tar.gz linux-3.10-45a41d147a3a31bb218201b0dd70cfe4e9ed5105.tar.bz2 linux-3.10-45a41d147a3a31bb218201b0dd70cfe4e9ed5105.zip | |
af_ieee802154: fix ioctl processing
fix two errors in ioctl processing:
1) if the ioctl isn't supported one should return -ENOIOCTLCMD
2) don't call ndo_do_ioctl if the device doesn't provide it
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee802154/af_ieee802154.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index 3bb6bdb1dac..af661805b9f 100644 --- a/net/ieee802154/af_ieee802154.c +++ b/net/ieee802154/af_ieee802154.c @@ -136,7 +136,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg, unsigned int cmd) { struct ifreq ifr; - int ret = -EINVAL; + int ret = -ENOIOCTLCMD; struct net_device *dev; if (copy_from_user(&ifr, arg, sizeof(struct ifreq))) @@ -146,8 +146,10 @@ 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) + + if ((dev->type == ARPHRD_IEEE802154 || + dev->type == ARPHRD_IEEE802154_PHY) && + 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))) |