enic: Decouple mac address registration and deregistration from port profile set...
authorRoopa Prabhu <roprabhu@cisco.com>
Fri, 4 Feb 2011 12:57:16 +0000 (12:57 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Feb 2011 19:49:01 +0000 (11:49 -0800)
This patch removes VM mac address registration and deregistration code during
port profile set operation. We can delay mac address registration until
enic_open.

Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/enic/enic.h
drivers/net/enic/enic_main.c

index ca3be4f..44865bb 100644 (file)
@@ -32,7 +32,7 @@
 
 #define DRV_NAME               "enic"
 #define DRV_DESCRIPTION                "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION            "2.1.1.2"
+#define DRV_VERSION            "2.1.1.2a"
 #define DRV_COPYRIGHT          "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX          6
index 89664c6..37f907b 100644 (file)
@@ -1381,9 +1381,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
 
                if (is_zero_ether_addr(netdev->dev_addr))
                        random_ether_addr(netdev->dev_addr);
-       } else if (new_pp.request == PORT_REQUEST_DISASSOCIATE) {
-               if (!is_zero_ether_addr(enic->pp.mac_addr))
-                       enic_dev_del_addr(enic, enic->pp.mac_addr);
        }
 
        memcpy(&enic->pp, &new_pp, sizeof(struct enic_port_profile));
@@ -1392,9 +1389,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
        if (err)
                goto set_port_profile_cleanup;
 
-       if (!is_zero_ether_addr(enic->pp.mac_addr))
-               enic_dev_add_addr(enic, enic->pp.mac_addr);
-
 set_port_profile_cleanup:
        memset(enic->pp.vf_mac, 0, ETH_ALEN);