diff options
Diffstat (limited to 'drivers/net')
-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 @@ | |||
32 | 32 | ||
33 | #define DRV_NAME "enic" | 33 | #define DRV_NAME "enic" |
34 | #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" | 34 | #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" |
35 | #define DRV_VERSION "2.1.1.7" | 35 | #define DRV_VERSION "2.1.1.8" |
36 | #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" | 36 | #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" |
37 | 37 | ||
38 | #define ENIC_BARS_MAX 6 | 38 | #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 = { | |||
2223 | .ndo_tx_timeout = enic_tx_timeout, | 2223 | .ndo_tx_timeout = enic_tx_timeout, |
2224 | .ndo_set_vf_port = enic_set_vf_port, | 2224 | .ndo_set_vf_port = enic_set_vf_port, |
2225 | .ndo_get_vf_port = enic_get_vf_port, | 2225 | .ndo_get_vf_port = enic_get_vf_port, |
2226 | #ifdef IFLA_VF_MAX | ||
2227 | .ndo_set_vf_mac = enic_set_vf_mac, | 2226 | .ndo_set_vf_mac = enic_set_vf_mac, |
2228 | #endif | ||
2229 | #ifdef CONFIG_NET_POLL_CONTROLLER | 2227 | #ifdef CONFIG_NET_POLL_CONTROLLER |
2230 | .ndo_poll_controller = enic_poll_controller, | 2228 | .ndo_poll_controller = enic_poll_controller, |
2231 | #endif | 2229 | #endif |