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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 47cc449d89d89746b1dba3cda6aae88afe1bf990..34f09e4383ca8ce2454515231fd25de8b7ec7787 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1482,9 +1482,10 @@ M:       Andy Whitcroft <apw@canonical.com>
 S:     Supported
 F:     scripts/checkpatch.pl
 
-CISCO 10G ETHERNET DRIVER
+CISCO VIC ETHERNET NIC DRIVER
 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
 F:     drivers/net/enic/
 

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0ba5b8e50a7cde9fba5ba976e656682dedfa2164..bf223fb4a86e54e4211ccb2bc05e5187e4bcdd2b 100644 (file)
--- a/drivers/net/Kconfig
+++ b/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/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 9f5ed3e5e3fec9eb56fd3fb9b04d52ebf6decf31..5fa56f1e5590b6e985363311a30b85c06f0cffca 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/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/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 18c043a3f4617574b81d1275a135c8b618adc121..6d70c349c954fa54a214369cd6983b5080433167 100644 (file)
--- 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)
        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;