1 files changed, 9 insertions, 13 deletions

diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 0531de6c7a4a..84e0a0379186 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -63,16 +63,6 @@ static struct rtnl_link_stats64 *internal_dev_get_stats(struct net_device *netde
         return stats;
 }
 
-static int internal_dev_mac_addr(struct net_device *dev, void *p)
-{
-        struct sockaddr *addr = p;
-
-        if (!is_valid_ether_addr(addr->sa_data))
-                return -EADDRNOTAVAIL;
-        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-        return 0;
-}
-
 /* Called with rcu_read_lock_bh. */
 static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
@@ -126,7 +116,7 @@ static const struct net_device_ops internal_dev_netdev_ops = {
         .ndo_open = internal_dev_open,
         .ndo_stop = internal_dev_stop,
         .ndo_start_xmit = internal_dev_xmit,
-        .ndo_set_mac_address = internal_dev_mac_addr,
+        .ndo_set_mac_address = eth_mac_addr,
         .ndo_change_mtu = internal_dev_change_mtu,
         .ndo_get_stats64 = internal_dev_get_stats,
 };
@@ -138,6 +128,7 @@ static void do_setup(struct net_device *netdev)
         netdev->netdev_ops = &internal_dev_netdev_ops;
 
         netdev->priv_flags &= ~IFF_TX_SKB_SHARING;
+        netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
         netdev->destructor = internal_dev_destructor;
         SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
         netdev->tx_queue_len = 0;
@@ -146,7 +137,7 @@ static void do_setup(struct net_device *netdev)
                            NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
 
         netdev->vlan_features = netdev->features;
-        netdev->features |= NETIF_F_HW_VLAN_TX;
+        netdev->features |= NETIF_F_HW_VLAN_CTAG_TX;
         netdev->hw_features = netdev->features & ~NETIF_F_LLTX;
         eth_hw_addr_random(netdev);
 }
@@ -182,16 +173,19 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
         if (vport->port_no == OVSP_LOCAL)
                 netdev_vport->dev->features |= NETIF_F_NETNS_LOCAL;
 
+        rtnl_lock();
         err = register_netdevice(netdev_vport->dev);
         if (err)
                 goto error_free_netdev;
 
         dev_set_promiscuity(netdev_vport->dev, 1);
+        rtnl_unlock();
         netif_start_queue(netdev_vport->dev);
 
         return vport;
 
 error_free_netdev:
+        rtnl_unlock();
         free_netdev(netdev_vport->dev);
 error_free_vport:
         ovs_vport_free(vport);
@@ -204,10 +198,13 @@ static void internal_dev_destroy(struct vport *vport)
         struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
         netif_stop_queue(netdev_vport->dev);
+        rtnl_lock();
         dev_set_promiscuity(netdev_vport->dev, -1);
 
         /* unregister_netdevice() waits for an RCU grace period. */
         unregister_netdevice(netdev_vport->dev);
+
+        rtnl_unlock();
 }
 
 static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
@@ -235,7 +232,6 @@ const struct vport_ops ovs_internal_vport_ops = {
         .create         = internal_dev_create,
         .destroy        = internal_dev_destroy,
         .get_name       = ovs_netdev_get_name,
-        .get_ifindex    = ovs_netdev_get_ifindex,
         .send           = internal_dev_recv,
 };