Merge branch 'master' of /home/cbou/linux-2.6

[linux-2.6] / drivers / net / ixgb / ixgb_main.c

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 526413482be25f7f934b52a9b61dd6235258e268..aa75385cd6c7ca67bfbc7c851db2101f986dd965 100644 (file)
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/10GbE Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -32,9 +32,9 @@ char ixgb_driver_name[] = "ixgb";
 static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
 
 #define DRIVERNAPI "-NAPI"
-#define DRV_VERSION "1.0.126" DRIVERNAPI
+#define DRV_VERSION "1.0.135-k2" DRIVERNAPI
 const char ixgb_driver_version[] = DRV_VERSION;
-static const char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
+static const char ixgb_copyright[] = "Copyright (c) 1999-2008 Intel Corporation.";
 
 #define IXGB_CB_LENGTH 256
 static unsigned int copybreak __read_mostly = IXGB_CB_LENGTH;
@@ -1053,11 +1053,15 @@ ixgb_set_multi(struct net_device *netdev)
 
        if (netdev->flags & IFF_PROMISC) {
                rctl |= (IXGB_RCTL_UPE | IXGB_RCTL_MPE);
-       } else if (netdev->flags & IFF_ALLMULTI) {
-               rctl |= IXGB_RCTL_MPE;
-               rctl &= ~IXGB_RCTL_UPE;
+               rctl &= ~IXGB_RCTL_VFE;
        } else {
-               rctl &= ~(IXGB_RCTL_UPE | IXGB_RCTL_MPE);
+               if (netdev->flags & IFF_ALLMULTI) {
+                       rctl |= IXGB_RCTL_MPE;
+                       rctl &= ~IXGB_RCTL_UPE;
+               } else {
+                       rctl &= ~(IXGB_RCTL_UPE | IXGB_RCTL_MPE);
+               }
+               rctl |= IXGB_RCTL_VFE;
        }
 
        if (netdev->mc_count > IXGB_MAX_NUM_MULTICAST_ADDRESSES) {
@@ -2104,7 +2108,6 @@ ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                /* enable VLAN receive filtering */
 
                rctl = IXGB_READ_REG(&adapter->hw, RCTL);
-               rctl |= IXGB_RCTL_VFE;
                rctl &= ~IXGB_RCTL_CFIEN;
                IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
        } else {
@@ -2113,12 +2116,6 @@ ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
                ctrl &= ~IXGB_CTRL0_VME;
                IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
-
-               /* disable VLAN filtering */
-
-               rctl = IXGB_READ_REG(&adapter->hw, RCTL);
-               rctl &= ~IXGB_RCTL_VFE;
-               IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
        }
 
        /* don't enable interrupts unless we are UP */