Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

enic: Clean up: Change driver description; Fix tab space; Update MAINTAINERS

Browse source 
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>
This commit is contained in:
Vasanthy Kolluri 2010-03-18 16:20:04 +00:00 committed by David S. Miller
parent d883aa7641
commit 641cb85e68
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
MAINTAINERS
View file

@ -1482,9 +1482,10 @@ M: Andy Whitcroft <apw@canonical.com>
S: Supported S: Supported
F: scripts/checkpatch.pl F: scripts/checkpatch.pl
CISCO 10G ETHERNET DRIVER CISCO VIC ETHERNET NIC DRIVER
M: Scott Feldman <scofeldm@cisco.com> M: Scott Feldman <scofeldm@cisco.com>
M: Joe Eykholt <jeykholt@cisco.com> M: Vasanthy Kolluri <vkolluri@cisco.com>
M: Roopa Prabhu <roprabhu@cisco.com>
S: Supported S: Supported
F: drivers/net/enic/ F: drivers/net/enic/

4
drivers/net/Kconfig
View file

@ -2593,11 +2593,11 @@ config EHEA
will be called ehea. will be called ehea.
config ENIC config ENIC
tristate "Cisco 10G Ethernet NIC support" tristate "Cisco VIC Ethernet NIC Support"
depends on PCI && INET depends on PCI && INET
select INET_LRO select INET_LRO
help help
This enables the support for the Cisco 10G Ethernet card. This enables the support for the Cisco VIC Ethernet card.
config IXGBE config IXGBE
tristate "Intel(R) 10GbE PCI Express adapters support" tristate "Intel(R) 10GbE PCI Express adapters support"

2
drivers/net/enic/enic.h
View file

@ -33,7 +33,7 @@
#include "vnic_rss.h" #include "vnic_rss.h"
#define DRV_NAME "enic" #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_VERSION "1.3.1.1"
#define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc" #define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc"
#define PFX DRV_NAME ": " #define PFX DRV_NAME ": "

2
drivers/net/enic/enic_main.c
View file

@ -829,7 +829,7 @@ static void enic_set_multicast_list(struct net_device *netdev)
int promisc = (netdev->flags & IFF_PROMISC) ? 1 : 0; int promisc = (netdev->flags & IFF_PROMISC) ? 1 : 0;
unsigned int mc_count = netdev_mc_count(netdev); unsigned int mc_count = netdev_mc_count(netdev);
int allmulti = (netdev->flags & IFF_ALLMULTI) || 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); unsigned int flags = netdev->flags | (allmulti ? IFF_ALLMULTI : 0);
u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN]; u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
unsigned int i, j; unsigned int i, j;