lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Vasanthy Kolluri
2011-02-04 16:17:10 +00:00
committed by David S. Miller
parent 519874619f
commit 115d56f723
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/enic/enic.h
View File

@@ -32,7 +32,7 @@
#define DRV_NAME "enic" #define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" #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 DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc"
#define ENIC_BARS_MAX 6 #define ENIC_BARS_MAX 6

26
drivers/net/enic/enic_dev.c
View File

@@ -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 enic_dev_add_station_addr(struct enic *enic)
{ {
int err = 0; int err;
if (is_valid_ether_addr(enic->netdev->dev_addr)) { if (!is_valid_ether_addr(enic->netdev->dev_addr))
spin_lock(&enic->devcmd_lock); return -EADDRNOTAVAIL;
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; return err;
} }
int enic_dev_del_station_addr(struct enic *enic) int enic_dev_del_station_addr(struct enic *enic)
{ {
int err = 0; int err;
if (is_valid_ether_addr(enic->netdev->dev_addr)) { if (!is_valid_ether_addr(enic->netdev->dev_addr))
spin_lock(&enic->devcmd_lock); return -EADDRNOTAVAIL;
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; return err;
} }