diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-08-14 20:00:20 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-08-19 23:08:24 +0400 |
| commit | 929122cdd5d4c344e59f9b55f870a8fcf7aa0d27 (patch) | |
| tree | 3054330ee58125a69391790ffb4a53c3cba931b7 /net/ieee802154 | |
| parent | 16eea493da563b5a3356a77c6d8776dffc29d3b6 (diff) | |
| download | blackbird-op-linux-929122cdd5d4c344e59f9b55f870a8fcf7aa0d27.tar.gz blackbird-op-linux-929122cdd5d4c344e59f9b55f870a8fcf7aa0d27.zip | |
Drop ARPHRD_IEEE802154_PHY
There are not maste devices in mac802154 anymore, so drop
ARPHRD_IEEE802154_PHY definition.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'net/ieee802154')
| -rw-r--r-- | net/ieee802154/af_ieee802154.c | 4 | ||||
| -rw-r--r-- | net/ieee802154/raw.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index d504c349cb0c..cd949d5e451b 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))) diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index 60dee69a1d04..4681501aae93 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c @@ -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; } |
