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: (30 commits)
  X25: remove duplicated #include
  tcp: use correct net ns in cookie_v4_check()
  rps: tcp: fix rps_sock_flow_table table updates
  ppp_generic: fix multilink fragment sizes
  syncookies: remove Kconfig text line about disabled-by-default
  ixgbe: only check pfc bits in hang logic if pfc is enabled
  net: check for refcount if pop a stacked dst_entry
  ixgbe: return IXGBE_ERR_RAR_INDEX when out of range
  act_pedit: access skb->data safely
  sfc: Store port number in net_device::dev_id
  epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN
  tehuti: return -EFAULT on copy_to_user errors
  isdn/kcapi: return -EFAULT on copy_from_user errors
  e1000e: change logical negate to bitwise
  sfc: Get port number from CS_PORT_NUM, not PCI function number
  cls_u32: use skb_header_pointer() to dereference data safely
  TCP: tcp_hybla: Fix integer overflow in slow start increment
  act_nat: fix the wrong checksum when addr isn't in old_addr/mask
  net/fec: fix pm to survive to suspend/resume
  korina: count RX DMA OVR as rx_fifo_error
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index ddf7a86cd466..edfff92a6d8e 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1373,10 +1373,9 @@ fec_suspend(struct platform_device *dev, pm_message_t state)
 
         if (ndev) {
                 fep = netdev_priv(ndev);
-                if (netif_running(ndev)) {
-                        netif_device_detach(ndev);
-                        fec_stop(ndev);
-                }
+                if (netif_running(ndev))
+                        fec_enet_close(ndev);
+                clk_disable(fep->clk);
         }
         return 0;
 }
@@ -1385,12 +1384,13 @@ static int
 fec_resume(struct platform_device *dev)
 {
         struct net_device *ndev = platform_get_drvdata(dev);
+        struct fec_enet_private *fep;
 
         if (ndev) {
-                if (netif_running(ndev)) {
-                        fec_enet_init(ndev, 0);
-                        netif_device_attach(ndev);
-                }
+                fep = netdev_priv(ndev);
+                clk_enable(fep->clk);
+                if (netif_running(ndev))
+                        fec_enet_open(ndev);
         }
         return 0;
 }