From 158ccdf5e64d39a2ef29f502d2fe0d2f690a88f4 Mon Sep 17 00:00:00 2001 From: Vasanthy Kolluri Date: Thu, 18 Mar 2010 16:20:04 +0000 Subject: [PATCH] --- yaml --- r: 193623 b: refs/heads/master c: 641cb85e68945878d520d5fc3c2dc64aa1dda868 h: refs/heads/master i: 193621: 8f71d4a917f7164e5f88f0619c6344571aaef15d 193619: 084caf7c80d374888090851aac63542c0997cd06 193615: 4ab0fdd461e540025a5ffa6041548e282f657faf v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 5 +++-- trunk/drivers/net/Kconfig | 4 ++-- trunk/drivers/net/enic/enic.h | 2 +- trunk/drivers/net/enic/enic_main.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b151d18e8b5d..8e4cd93d7450 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d883aa76416f8e9e872f11ac08c5a3c6684840de +refs/heads/master: 641cb85e68945878d520d5fc3c2dc64aa1dda868 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 47cc449d89d8..34f09e4383ca 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1482,9 +1482,10 @@ M: Andy Whitcroft S: Supported F: scripts/checkpatch.pl -CISCO 10G ETHERNET DRIVER +CISCO VIC ETHERNET NIC DRIVER M: Scott Feldman -M: Joe Eykholt +M: Vasanthy Kolluri +M: Roopa Prabhu S: Supported F: drivers/net/enic/ diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 0ba5b8e50a7c..bf223fb4a86e 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -2593,11 +2593,11 @@ config EHEA will be called ehea. config ENIC - tristate "Cisco 10G Ethernet NIC support" + tristate "Cisco VIC Ethernet NIC Support" depends on PCI && INET select INET_LRO help - This enables the support for the Cisco 10G Ethernet card. + This enables the support for the Cisco VIC Ethernet card. config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" diff --git a/trunk/drivers/net/enic/enic.h b/trunk/drivers/net/enic/enic.h index 9f5ed3e5e3fe..5fa56f1e5590 100644 --- a/trunk/drivers/net/enic/enic.h +++ b/trunk/drivers/net/enic/enic.h @@ -33,7 +33,7 @@ #include "vnic_rss.h" #define DRV_NAME "enic" -#define DRV_DESCRIPTION "Cisco 10G Ethernet Driver" +#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" #define DRV_VERSION "1.3.1.1" #define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc" #define PFX DRV_NAME ": " diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index 18c043a3f461..6d70c349c954 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/drivers/net/enic/enic_main.c @@ -829,7 +829,7 @@ static void enic_set_multicast_list(struct net_device *netdev) int promisc = (netdev->flags & IFF_PROMISC) ? 1 : 0; unsigned int mc_count = netdev_mc_count(netdev); int allmulti = (netdev->flags & IFF_ALLMULTI) || - mc_count > ENIC_MULTICAST_PERFECT_FILTERS; + mc_count > ENIC_MULTICAST_PERFECT_FILTERS; unsigned int flags = netdev->flags | (allmulti ? IFF_ALLMULTI : 0); u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN]; unsigned int i, j;