ieee802154: Remove 802.15.4/6LoWPAN checks for interface MTU.
In the past, 802.15.4 interfaces and 6LoWPAN interfaces used the same dev->type (ARPHRD_IEEE802154), and 802.15.4 interfaces were distinguished from 6LoWPAN interfaces by their differing dev->mtu. 6LoWPAN interfaces have their own ARPHRD type now, so there is no longer any need to check dev->mtu to distinguish 802.15.4 devices from 6LoWPAN devices. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Acked-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Родитель
d0997b44c9
Коммит
01c8d2bbd4
|
@ -168,10 +168,7 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info)
|
|||
if (!dev)
|
||||
return NULL;
|
||||
|
||||
/* Check on mtu is currently a hacked solution because lowpan
|
||||
* and wpan have the same ARPHRD type.
|
||||
*/
|
||||
if (dev->type != ARPHRD_IEEE802154 || dev->mtu != IEEE802154_MTU) {
|
||||
if (dev->type != ARPHRD_IEEE802154) {
|
||||
dev_put(dev);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -455,11 +452,7 @@ int ieee802154_dump_iface(struct sk_buff *skb, struct netlink_callback *cb)
|
|||
|
||||
idx = 0;
|
||||
for_each_netdev(net, dev) {
|
||||
/* Check on mtu is currently a hacked solution because lowpan
|
||||
* and wpan have the same ARPHRD type.
|
||||
*/
|
||||
if (idx < s_idx || dev->type != ARPHRD_IEEE802154 ||
|
||||
dev->mtu != IEEE802154_MTU)
|
||||
if (idx < s_idx || dev->type != ARPHRD_IEEE802154)
|
||||
goto cont;
|
||||
|
||||
if (ieee802154_nl_fill_iface(skb, NETLINK_CB(cb->skb).portid,
|
||||
|
@ -789,11 +782,7 @@ ieee802154_llsec_dump_table(struct sk_buff *skb, struct netlink_callback *cb,
|
|||
int rc;
|
||||
|
||||
for_each_netdev(net, dev) {
|
||||
/* Check on mtu is currently a hacked solution because lowpan
|
||||
* and wpan have the same ARPHRD type.
|
||||
*/
|
||||
if (idx < first_dev || dev->type != ARPHRD_IEEE802154 ||
|
||||
dev->mtu != IEEE802154_MTU)
|
||||
if (idx < first_dev || dev->type != ARPHRD_IEEE802154)
|
||||
goto skip;
|
||||
|
||||
data.ops = ieee802154_mlme_ops(dev);
|
||||
|
|
Загрузка…
Ссылка в новой задаче