diff options
| author | Vasanthy Kolluri <vkolluri@cisco.com> | 2011-02-17 09:53:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-17 23:14:09 +0100 |
| commit | 5990b1892bbd0bb3adfc9a09bb3bcbde32471e59 (patch) | |
| tree | 77582a946fffbb7dbc29e9f9357423c1b28cc702 /drivers/net/enic | |
| parent | enic: Bug fix: Reset driver count of registered unicast addresses to zero dur... (diff) | |
| download | linux-5990b1892bbd0bb3adfc9a09bb3bcbde32471e59.tar.xz linux-5990b1892bbd0bb3adfc9a09bb3bcbde32471e59.zip | |
enic: Clean up: Remove a not needed #ifdef
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: Danny Guo <dannguo@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>
Diffstat (limited to 'drivers/net/enic')
| -rw-r--r-- | drivers/net/enic/enic.h | 2 | ||||
| -rw-r--r-- | drivers/net/enic/enic_main.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 5f4eb45345c1..2ac891b58db3 100644 --- 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.7" +#define DRV_VERSION "2.1.1.8" #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index a625a0e09169..d1aa80770541 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -2223,9 +2223,7 @@ static const struct net_device_ops enic_netdev_dynamic_ops = { .ndo_tx_timeout = enic_tx_timeout, .ndo_set_vf_port = enic_set_vf_port, .ndo_get_vf_port = enic_get_vf_port, -#ifdef IFLA_VF_MAX .ndo_set_vf_mac = enic_set_vf_mac, -#endif #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = enic_poll_controller, #endif |