Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[~andy/linux] / drivers / net / team / team.c

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index b75ae5bde6734c1c70b196c00a841d84f0f984dd..c8624a8235ab2f1020c4c387be290b631ed1b0dc 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1648,7 +1648,7 @@ static netdev_tx_t team_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 static u16 team_select_queue(struct net_device *dev, struct sk_buff *skb,
-                            void *accel_priv)
+                            void *accel_priv, select_queue_fallback_t fallback)
 {
        /*
         * This helper function exists to help dev_pick_tx get the correct
@@ -2034,6 +2034,10 @@ static void team_setup(struct net_device *dev)
 
        dev->features |= NETIF_F_LLTX;
        dev->features |= NETIF_F_GRO;
+
+       /* Don't allow team devices to change network namespaces. */
+       dev->features |= NETIF_F_NETNS_LOCAL;
+
        dev->hw_features = TEAM_VLAN_FEATURES |
                           NETIF_F_HW_VLAN_CTAG_TX |
                           NETIF_F_HW_VLAN_CTAG_RX |
@@ -2851,7 +2855,7 @@ static int team_device_event(struct notifier_block *unused,
        case NETDEV_FEAT_CHANGE:
                team_compute_features(port->team);
                break;
-       case NETDEV_CHANGEMTU:
+       case NETDEV_PRECHANGEMTU:
                /* Forbid to change mtu of underlaying device */
                return NOTIFY_BAD;
        case NETDEV_PRE_TYPE_CHANGE: