diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-23 19:19:30 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-23 19:19:30 -0700 |
commit | 940917226260d6e029f55742a34a7d7810983c75 (patch) | |
tree | 871af506fa09aa2717c6c27307838f43993dabaf /net/ieee802154/raw.c | |
parent | 9818f660f433b58e770cfeb2ee9566f7b42ca0ae (diff) | |
parent | 929122cdd5d4c344e59f9b55f870a8fcf7aa0d27 (diff) | |
download | op-kernel-dev-940917226260d6e029f55742a34a7d7810983c75.zip op-kernel-dev-940917226260d6e029f55742a34a7d7810983c75.tar.gz |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'net/ieee802154/raw.c')
-rw-r--r-- | net/ieee802154/raw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index 60dee69..4681501 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; } |