Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
  ipw2200: Call netif_*_queue() interfaces properly.
  netxen: Needs to include linux/vmalloc.h
  [netdrvr] atl1d: fix !CONFIG_PM build
  r6040: rework init_one error handling
  r6040: bump release number to 0.18
  r6040: handle RX fifo full and no descriptor interrupts
  r6040: change the default waiting time
  r6040: use definitions for magic values in descriptor status
  r6040: completely rework the RX path
  r6040: call napi_disable when puting down the interface and set lp->dev accordingly.
  mv643xx_eth: fix NETPOLL build
  r6040: rework the RX buffers allocation routine
  r6040: fix scheduling while atomic in r6040_tx_timeout
  r6040: fix null pointer access and tx timeouts
  r6040: prefix all functions with r6040
  rndis_host: support WM6 devices as modems
  at91_ether: use netstats in net_device structure
  sfc: Create one RX queue and interrupt per CPU package by default
  sfc: Use a separate workqueue for resets
  sfc: I2C adapter initialisation fixes
  ...

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 92591384afa5..9a51ec8293cc 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -730,9 +730,6 @@ static void generic_adjust_link(struct  net_device *dev)
                 if (!fep->oldlink) {
                         new_state = 1;
                         fep->oldlink = 1;
-                        netif_tx_schedule_all(dev);
-                        netif_carrier_on(dev);
-                        netif_start_queue(dev);
                 }
 
                 if (new_state)
@@ -742,8 +739,6 @@ static void generic_adjust_link(struct  net_device *dev)
                 fep->oldlink = 0;
                 fep->oldspeed = 0;
                 fep->oldduplex = -1;
-                netif_carrier_off(dev);
-                netif_stop_queue(dev);
         }
 
         if (new_state && netif_msg_link(fep))
@@ -818,6 +813,8 @@ static int fs_enet_open(struct net_device *dev)
         }
         phy_start(fep->phydev);
 
+        netif_start_queue(dev);
+
         return 0;
 }