Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7aa458f7d8b862c91471babc4ebe46232e5b9ec3..cf12b05cd011fcbd4db80d12273731d4c4ff9c03 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1472,6 +1472,8 @@ e1000_open(struct net_device *netdev)
 
        e1000_irq_enable(adapter);
 
+       netif_start_queue(netdev);
+
        /* fire a link status change interrupt to start the watchdog */
        E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC);
 
@@ -2477,10 +2479,15 @@ e1000_set_rx_mode(struct net_device *netdev)
 
        if (netdev->flags & IFF_PROMISC) {
                rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
-       } else if (netdev->flags & IFF_ALLMULTI) {
-               rctl |= E1000_RCTL_MPE;
+               rctl &= ~E1000_RCTL_VFE;
        } else {
-               rctl &= ~E1000_RCTL_MPE;
+               if (netdev->flags & IFF_ALLMULTI) {
+                       rctl |= E1000_RCTL_MPE;
+               } else {
+                       rctl &= ~E1000_RCTL_MPE;
+               }
+               if (adapter->hw.mac_type != e1000_ich8lan)
+                       rctl |= E1000_RCTL_VFE;
        }
 
        uc_ptr = NULL;
@@ -4962,7 +4969,6 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                if (adapter->hw.mac_type != e1000_ich8lan) {
                        /* enable VLAN receive filtering */
                        rctl = E1000_READ_REG(&adapter->hw, RCTL);
-                       rctl |= E1000_RCTL_VFE;
                        rctl &= ~E1000_RCTL_CFIEN;
                        E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
                        e1000_update_mng_vlan(adapter);
@@ -4974,10 +4980,6 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
 
                if (adapter->hw.mac_type != e1000_ich8lan) {
-                       /* disable VLAN filtering */
-                       rctl = E1000_READ_REG(&adapter->hw, RCTL);
-                       rctl &= ~E1000_RCTL_VFE;
-                       E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
                        if (adapter->mng_vlan_id !=
                            (u16)E1000_MNG_VLAN_NONE) {
                                e1000_vlan_rx_kill_vid(netdev,