diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 4 | ||||
-rw-r--r-- | drivers/net/enic/enic.h | 2 | ||||
-rw-r--r-- | drivers/net/enic/enic_main.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0ba5b8e50a7c..bf223fb4a86e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2593,11 +2593,11 @@ config EHEA | |||
2593 | will be called ehea. | 2593 | will be called ehea. |
2594 | 2594 | ||
2595 | config ENIC | 2595 | config ENIC |
2596 | tristate "Cisco 10G Ethernet NIC support" | 2596 | tristate "Cisco VIC Ethernet NIC Support" |
2597 | depends on PCI && INET | 2597 | depends on PCI && INET |
2598 | select INET_LRO | 2598 | select INET_LRO |
2599 | help | 2599 | help |
2600 | This enables the support for the Cisco 10G Ethernet card. | 2600 | This enables the support for the Cisco VIC Ethernet card. |
2601 | 2601 | ||
2602 | config IXGBE | 2602 | config IXGBE |
2603 | tristate "Intel(R) 10GbE PCI Express adapters support" | 2603 | tristate "Intel(R) 10GbE PCI Express adapters support" |
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 9f5ed3e5e3fe..5fa56f1e5590 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "vnic_rss.h" | 33 | #include "vnic_rss.h" |
34 | 34 | ||
35 | #define DRV_NAME "enic" | 35 | #define DRV_NAME "enic" |
36 | #define DRV_DESCRIPTION "Cisco 10G Ethernet Driver" | 36 | #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" |
37 | #define DRV_VERSION "1.3.1.1" | 37 | #define DRV_VERSION "1.3.1.1" |
38 | #define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc" | 38 | #define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc" |
39 | #define PFX DRV_NAME ": " | 39 | #define PFX DRV_NAME ": " |
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 18c043a3f461..6d70c349c954 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c | |||
@@ -829,7 +829,7 @@ static void enic_set_multicast_list(struct net_device *netdev) | |||
829 | int promisc = (netdev->flags & IFF_PROMISC) ? 1 : 0; | 829 | int promisc = (netdev->flags & IFF_PROMISC) ? 1 : 0; |
830 | unsigned int mc_count = netdev_mc_count(netdev); | 830 | unsigned int mc_count = netdev_mc_count(netdev); |
831 | int allmulti = (netdev->flags & IFF_ALLMULTI) || | 831 | int allmulti = (netdev->flags & IFF_ALLMULTI) || |
832 | mc_count > ENIC_MULTICAST_PERFECT_FILTERS; | 832 | mc_count > ENIC_MULTICAST_PERFECT_FILTERS; |
833 | unsigned int flags = netdev->flags | (allmulti ? IFF_ALLMULTI : 0); | 833 | unsigned int flags = netdev->flags | (allmulti ? IFF_ALLMULTI : 0); |
834 | u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN]; | 834 | u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN]; |
835 | unsigned int i, j; | 835 | unsigned int i, j; |