Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2015-03-02

Here's the first bluetooth-next pull request targeting the 4.1 kernel:

 - ieee802154/6lowpan cleanups
 - SCO routing to host interface support for the btmrvl driver
 - AMP code cleanups
 - Fixes to AMP HCI init sequence
 - Refactoring of the HCI callback mechanism
 - Added shutdown routine for Intel controllers in the btusb driver
 - New config option to enable/disable Bluetooth debugfs information
 - Fix for early data reception on L2CAP fixed channels

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 5 insertions, 2 deletions

diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
index 055fbb71ba6f..dfd3c6007f60 100644
--- a/net/ieee802154/6lowpan/core.c
+++ b/net/ieee802154/6lowpan/core.c
@@ -126,6 +126,7 @@ static void lowpan_setup(struct net_device *dev)
         dev->header_ops         = &lowpan_header_ops;
         dev->ml_priv            = &lowpan_mlme;
         dev->destructor         = free_netdev;
+        dev->features           |= NETIF_F_NETNS_LOCAL;
 }
 
 static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -148,10 +149,11 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev,
 
         pr_debug("adding new link\n");
 
-        if (!tb[IFLA_LINK])
+        if (!tb[IFLA_LINK] ||
+            !net_eq(dev_net(dev), &init_net))
                 return -EINVAL;
         /* find and hold real wpan device */
-        real_dev = dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));
+        real_dev = dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK]));
         if (!real_dev)
                 return -ENODEV;
         if (real_dev->type != ARPHRD_IEEE802154) {
diff --git a/net/ieee802154/core.c b/net/ieee802154/core.c
index 18bc7e738507..888d0991c761 100644
--- a/net/ieee802154/core.c
+++ b/net/ieee802154/core.c
@@ -225,6 +225,7 @@ static int cfg802154_netdev_notifier_call(struct notifier_block *nb,
         switch (state) {
                 /* TODO NETDEV_DEVTYPE */
         case NETDEV_REGISTER:
+                dev->features |= NETIF_F_NETNS_LOCAL;
                 wpan_dev->identifier = ++rdev->wpan_dev_id;
                 list_add_rcu(&wpan_dev->list, &rdev->wpan_dev_list);
                 rdev->devlist_generation++;