enic: Bug Fix: Fix return values of enic_add/del_station_addr routines

Fix enic_add/del_station_addr routines to return appropriate error code when an invalid address is added or deleted.

Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 1385a609ed4980c801f01e702c9bb28447455123..f38ad634989c1a8938a61f767b38420d4b50fe4f 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
 
 #define DRV_NAME               "enic"
 #define DRV_DESCRIPTION                "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION            "2.1.1.3"
+#define DRV_VERSION            "2.1.1.4"
 #define DRV_COPYRIGHT          "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX          6

diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/enic/enic_dev.c
index a52dbd2b3c63d4be9efb31f21257e574da5957a5..382626628b1b02813d36cff6466711743b08f3b0 100644 (file)
--- a/drivers/net/enic/enic_dev.c
+++ b/drivers/net/enic/enic_dev.c
@@ -49,26 +49,28 @@ int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
 
 int enic_dev_add_station_addr(struct enic *enic)
 {
-       int err = 0;
+       int err;
+
+       if (!is_valid_ether_addr(enic->netdev->dev_addr))
+               return -EADDRNOTAVAIL;
 
-       if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-               spin_lock(&enic->devcmd_lock);
-               err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
-               spin_unlock(&enic->devcmd_lock);
-       }
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
+       spin_unlock(&enic->devcmd_lock);
 
        return err;
 }
 
 int enic_dev_del_station_addr(struct enic *enic)
 {
-       int err = 0;
+       int err;
+
+       if (!is_valid_ether_addr(enic->netdev->dev_addr))
+               return -EADDRNOTAVAIL;
 
-       if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-               spin_lock(&enic->devcmd_lock);
-               err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
-               spin_unlock(&enic->devcmd_lock);
-       }
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
+       spin_unlock(&enic->devcmd_lock);
 
        return err;
 }