projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: introduce nla_policy for IFLA_NEW_IFINDEX
[linux-2.6-microblaze.git]
/
net
/
ieee802154
/
core.c
diff --git
a/net/ieee802154/core.c
b/net/ieee802154/core.c
index
de259b5
..
ec30689
100644
(file)
--- a/
net/ieee802154/core.c
+++ b/
net/ieee802154/core.c
@@
-205,7
+205,7
@@
int cfg802154_switch_netns(struct cfg802154_registered_device *rdev,
if (!wpan_dev->netdev)
continue;
wpan_dev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
if (!wpan_dev->netdev)
continue;
wpan_dev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
- err = dev_change_net_namespace(wpan_dev->netdev, net, "wpan%d");
+ err = dev_change_net_namespace(wpan_dev->netdev, net, "wpan%d"
, 0
);
if (err)
break;
wpan_dev->netdev->features |= NETIF_F_NETNS_LOCAL;
if (err)
break;
wpan_dev->netdev->features |= NETIF_F_NETNS_LOCAL;
@@
-222,7
+222,7
@@
int cfg802154_switch_netns(struct cfg802154_registered_device *rdev,
continue;
wpan_dev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
err = dev_change_net_namespace(wpan_dev->netdev, net,
continue;
wpan_dev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
err = dev_change_net_namespace(wpan_dev->netdev, net,
- "wpan%d");
+ "wpan%d"
, 0
);
WARN_ON(err);
wpan_dev->netdev->features |= NETIF_F_NETNS_LOCAL;
}
WARN_ON(err);
wpan_dev->netdev->features |= NETIF_F_NETNS_LOCAL;
}