diff options
author | Vasanthy Kolluri <vkolluri@cisco.com> | 2010-03-18 12:20:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-19 00:22:49 -0400 |
commit | 641cb85e68945878d520d5fc3c2dc64aa1dda868 (patch) | |
tree | 251c8de46cd36c62100b65cddd6a3ec9c922bd97 | |
parent | d883aa76416f8e9e872f11ac08c5a3c6684840de (diff) |
enic: Clean up: Change driver description; Fix tab space; Update MAINTAINERS
1) Change enic driver description to "Cisco VIC Ethernet NIC Driver"
2) Fix tab space
3) Update MAINTAINERS list
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | MAINTAINERS | 5 | ||||
-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 |
4 files changed, 7 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 47cc449d89d8..34f09e4383ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1482,9 +1482,10 @@ M: Andy Whitcroft <apw@canonical.com> | |||
1482 | S: Supported | 1482 | S: Supported |
1483 | F: scripts/checkpatch.pl | 1483 | F: scripts/checkpatch.pl |
1484 | 1484 | ||
1485 | CISCO 10G ETHERNET DRIVER | 1485 | CISCO VIC ETHERNET NIC DRIVER |
1486 | M: Scott Feldman <scofeldm@cisco.com> | 1486 | M: Scott Feldman <scofeldm@cisco.com> |
1487 | M: Joe Eykholt <jeykholt@cisco.com> | 1487 | M: Vasanthy Kolluri <vkolluri@cisco.com> |
1488 | M: Roopa Prabhu <roprabhu@cisco.com> | ||
1488 | S: Supported | 1489 | S: Supported |
1489 | F: drivers/net/enic/ | 1490 | F: drivers/net/enic/ |
1490 | 1491 | ||
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; |