5 files changed, 70 insertions, 126 deletions

diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h
index 52abbbdf8a08..925929d764ca 100644
--- a/drivers/net/atl1c/atl1c.h
+++ b/drivers/net/atl1c/atl1c.h
@@ -265,7 +265,7 @@ struct atl1c_recv_ret_status {
         __le32  word3;
 };
 
-/* RFD desciptor */
+/* RFD descriptor */
 struct atl1c_rx_free_desc {
         __le64  buffer_addr;
 };
@@ -531,7 +531,7 @@ struct atl1c_rfd_ring {
         struct atl1c_buffer *buffer_info;
 };
 
-/* receive return desciptor (rrd) ring */
+/* receive return descriptor (rrd) ring */
 struct atl1c_rrd_ring {
         void *desc;             /* descriptor ring virtual address */
         dma_addr_t dma;         /* descriptor ring physical address */
@@ -559,7 +559,6 @@ struct atl1c_adapter {
         struct napi_struct  napi;
         struct atl1c_hw        hw;
         struct atl1c_hw_stats  hw_stats;
-        struct net_device_stats net_stats;
         struct mii_if_info  mii;    /* MII interface info */
         u16 rx_buffer_len;
 
@@ -567,9 +566,9 @@ struct atl1c_adapter {
 #define __AT_TESTING        0x0001
 #define __AT_RESETTING      0x0002
 #define __AT_DOWN           0x0003
-        u8 work_event;
-#define ATL1C_WORK_EVENT_RESET          0x01
-#define ATL1C_WORK_EVENT_LINK_CHANGE    0x02
+        unsigned long work_event;
+#define ATL1C_WORK_EVENT_RESET          0
+#define ATL1C_WORK_EVENT_LINK_CHANGE    1
         u32 msg_enable;
 
         bool have_msi;
@@ -632,8 +631,6 @@ struct atl1c_adapter {
 extern char atl1c_driver_name[];
 extern char atl1c_driver_version[];
 
-extern int atl1c_up(struct atl1c_adapter *adapter);
-extern void atl1c_down(struct atl1c_adapter *adapter);
 extern void atl1c_reinit_locked(struct atl1c_adapter *adapter);
 extern s32 atl1c_reset_hw(struct atl1c_hw *hw);
 extern void atl1c_set_ethtool_ops(struct net_device *netdev);
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/atl1c/atl1c_ethtool.c
index 7c521508313c..7be884d0aaf6 100644
--- a/drivers/net/atl1c/atl1c_ethtool.c
+++ b/drivers/net/atl1c/atl1c_ethtool.c
@@ -50,13 +50,13 @@ static int atl1c_get_settings(struct net_device *netdev,
         ecmd->transceiver = XCVR_INTERNAL;
 
         if (adapter->link_speed != SPEED_0) {
-                ecmd->speed = adapter->link_speed;
+                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                 if (adapter->link_duplex == FULL_DUPLEX)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -77,7 +77,8 @@ static int atl1c_set_settings(struct net_device *netdev,
         if (ecmd->autoneg == AUTONEG_ENABLE) {
                 autoneg_advertised = ADVERTISED_Autoneg;
         } else {
-                if (ecmd->speed == SPEED_1000) {
+                u32 speed = ethtool_cmd_speed(ecmd);
+                if (speed == SPEED_1000) {
                         if (ecmd->duplex != DUPLEX_FULL) {
                                 if (netif_msg_link(adapter))
                                         dev_warn(&adapter->pdev->dev,
@@ -86,7 +87,7 @@ static int atl1c_set_settings(struct net_device *netdev,
                                 return -EINVAL;
                         }
                         autoneg_advertised = ADVERTISED_1000baseT_Full;
-                } else if (ecmd->speed == SPEED_100) {
+                } else if (speed == SPEED_100) {
                         if (ecmd->duplex == DUPLEX_FULL)
                                 autoneg_advertised = ADVERTISED_100baseT_Full;
                         else
@@ -113,11 +114,6 @@ static int atl1c_set_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 atl1c_get_tx_csum(struct net_device *netdev)
-{
-        return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
 static u32 atl1c_get_msglevel(struct net_device *netdev)
 {
         struct atl1c_adapter *adapter = netdev_priv(netdev);
@@ -307,9 +303,6 @@ static const struct ethtool_ops atl1c_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
         .get_eeprom_len         = atl1c_get_eeprom_len,
         .get_eeprom             = atl1c_get_eeprom,
-        .get_tx_csum            = atl1c_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
 };
 
 void atl1c_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/atl1c/atl1c_hw.c
index d8501f060957..23f2ab0f2fa8 100644
--- a/drivers/net/atl1c/atl1c_hw.c
+++ b/drivers/net/atl1c/atl1c_hw.c
@@ -82,7 +82,7 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
         addr[0] = addr[1] = 0;
         AT_READ_REG(hw, REG_OTP_CTRL, &otp_ctrl_data);
         if (atl1c_check_eeprom_exist(hw)) {
-                if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b) {
+                if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c) {
                         /* Enable OTP CLK */
                         if (!(otp_ctrl_data & OTP_CTRL_CLK_EN)) {
                                 otp_ctrl_data |= OTP_CTRL_CLK_EN;
@@ -345,7 +345,7 @@ int atl1c_write_phy_reg(struct atl1c_hw *hw, u32 reg_addr, u16 phy_data)
  */
 static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
 {
-        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_SPEED_MASK;
+        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_ALL;
         u16 mii_giga_ctrl_data = GIGA_CR_1000T_DEFAULT_CAP &
                                 ~GIGA_CR_1000T_SPEED_MASK;
 
@@ -373,7 +373,7 @@ static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
         }
 
         if (atl1c_write_phy_reg(hw, MII_ADVERTISE, mii_adv_data) != 0 ||
-            atl1c_write_phy_reg(hw, MII_GIGA_CR, mii_giga_ctrl_data) != 0)
+            atl1c_write_phy_reg(hw, MII_CTRL1000, mii_giga_ctrl_data) != 0)
                 return -1;
         return 0;
 }
@@ -480,7 +480,7 @@ int atl1c_phy_reset(struct atl1c_hw *hw)
                 atl1c_write_phy_reg(hw, MII_DBG_DATA, 0x929D);
         }
         if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b2
-                || hw->nic_type == athr_l2c || hw->nic_type == athr_l2c) {
+                || hw->nic_type == athr_l2c) {
                 atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
                 atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
         }
@@ -517,19 +517,18 @@ int atl1c_phy_init(struct atl1c_hw *hw)
                                         "Error Setting up Auto-Negotiation\n");
                         return ret_val;
                 }
-                mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+                mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
                 break;
         case MEDIA_TYPE_100M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_100 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_SPEED100 | BMCR_FULLDPLX;
                 break;
         case MEDIA_TYPE_100M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_100;
+                mii_bmcr_data |= BMCR_SPEED100;
                 break;
         case MEDIA_TYPE_10M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_10 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_FULLDPLX;
                 break;
         case MEDIA_TYPE_10M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_10;
                 break;
         default:
                 if (netif_msg_link(adapter))
@@ -657,7 +656,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)
         err = atl1c_phy_setup_adv(hw);
         if (err)
                 return err;
-        mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+        mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
 
         return atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
 }
diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/atl1c/atl1c_hw.h
index 3dd675979aa1..655fc6c4a8a4 100644
--- a/drivers/net/atl1c/atl1c_hw.h
+++ b/drivers/net/atl1c/atl1c_hw.h
@@ -736,55 +736,16 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define REG_DEBUG_DATA0                 0x1900
 #define REG_DEBUG_DATA1                 0x1904
 
-/* PHY Control Register */
-#define MII_BMCR                        0x00
-#define BMCR_SPEED_SELECT_MSB           0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define BMCR_COLL_TEST_ENABLE           0x0080  /* Collision test enable */
-#define BMCR_FULL_DUPLEX                0x0100  /* FDX =1, half duplex =0 */
-#define BMCR_RESTART_AUTO_NEG           0x0200  /* Restart auto negotiation */
-#define BMCR_ISOLATE                    0x0400  /* Isolate PHY from MII */
-#define BMCR_POWER_DOWN                 0x0800  /* Power down */
-#define BMCR_AUTO_NEG_EN                0x1000  /* Auto Neg Enable */
-#define BMCR_SPEED_SELECT_LSB           0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define BMCR_LOOPBACK                   0x4000  /* 0 = normal, 1 = loopback */
-#define BMCR_RESET                      0x8000  /* 0 = normal, 1 = PHY reset */
-#define BMCR_SPEED_MASK                 0x2040
-#define BMCR_SPEED_1000                 0x0040
-#define BMCR_SPEED_100                  0x2000
-#define BMCR_SPEED_10                   0x0000
-
-/* PHY Status Register */
-#define MII_BMSR                        0x01
-#define BMMSR_EXTENDED_CAPS             0x0001  /* Extended register capabilities */
-#define BMSR_JABBER_DETECT              0x0002  /* Jabber Detected */
-#define BMSR_LINK_STATUS                0x0004  /* Link Status 1 = link */
-#define BMSR_AUTONEG_CAPS               0x0008  /* Auto Neg Capable */
-#define BMSR_REMOTE_FAULT               0x0010  /* Remote Fault Detect */
-#define BMSR_AUTONEG_COMPLETE           0x0020  /* Auto Neg Complete */
-#define BMSR_PREAMBLE_SUPPRESS          0x0040  /* Preamble may be suppressed */
-#define BMSR_EXTENDED_STATUS            0x0100  /* Ext. status info in Reg 0x0F */
-#define BMSR_100T2_HD_CAPS              0x0200  /* 100T2 Half Duplex Capable */
-#define BMSR_100T2_FD_CAPS              0x0400  /* 100T2 Full Duplex Capable */
-#define BMSR_10T_HD_CAPS                0x0800  /* 10T   Half Duplex Capable */
-#define BMSR_10T_FD_CAPS                0x1000  /* 10T   Full Duplex Capable */
-#define BMSR_100X_HD_CAPS               0x2000  /* 100X  Half Duplex Capable */
-#define BMMII_SR_100X_FD_CAPS           0x4000  /* 100X  Full Duplex Capable */
-#define BMMII_SR_100T4_CAPS             0x8000  /* 100T4 Capable */
-
-#define MII_PHYSID1                     0x02
-#define MII_PHYSID2                     0x03
 #define L1D_MPW_PHYID1                  0xD01C  /* V7 */
 #define L1D_MPW_PHYID2                  0xD01D  /* V1-V6 */
 #define L1D_MPW_PHYID3                  0xD01E  /* V8 */
 
 
 /* Autoneg Advertisement Register */
-#define MII_ADVERTISE                   0x04
-#define ADVERTISE_SPEED_MASK            0x01E0
-#define ADVERTISE_DEFAULT_CAP           0x0DE0
+#define ADVERTISE_DEFAULT_CAP \
+        (ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)
 
 /* 1000BASE-T Control Register */
-#define MII_GIGA_CR                     0x09
 #define GIGA_CR_1000T_REPEATER_DTE      0x0400  /* 1=Repeater/switch device port 0=DTE device */
 
 #define GIGA_CR_1000T_MS_VALUE          0x0800  /* 1=Configure PHY as Master 0=Configure PHY as Slave */
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index c7b8ef507ebd..1269ba5d6e56 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -48,6 +48,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)},
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D_2_0)},
         /* required last entry */
         { 0 }
 };
@@ -66,6 +67,8 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup);
 static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter);
 static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter, u8 que,
                    int *work_done, int work_to_do);
+static int atl1c_up(struct atl1c_adapter *adapter);
+static void atl1c_down(struct atl1c_adapter *adapter);
 
 static const u16 atl1c_pay_load_size[] = {
         128, 256, 512, 1024, 2048, 4096,
@@ -322,7 +325,7 @@ static void atl1c_link_chg_event(struct atl1c_adapter *adapter)
                 }
         }
 
-        adapter->work_event |= ATL1C_WORK_EVENT_LINK_CHANGE;
+        set_bit(ATL1C_WORK_EVENT_LINK_CHANGE, &adapter->work_event);
         schedule_work(&adapter->common_task);
 }
 
@@ -334,20 +337,16 @@ static void atl1c_common_task(struct work_struct *work)
         adapter = container_of(work, struct atl1c_adapter, common_task);
         netdev = adapter->netdev;
 
-        if (adapter->work_event & ATL1C_WORK_EVENT_RESET) {
-                adapter->work_event &= ~ATL1C_WORK_EVENT_RESET;
+        if (test_and_clear_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event)) {
                 netif_device_detach(netdev);
                 atl1c_down(adapter);
                 atl1c_up(adapter);
                 netif_device_attach(netdev);
-                return;
         }
 
-        if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE) {
-                adapter->work_event &= ~ATL1C_WORK_EVENT_LINK_CHANGE;
+        if (test_and_clear_bit(ATL1C_WORK_EVENT_LINK_CHANGE,
+                &adapter->work_event))
                 atl1c_check_link_status(adapter);
-        }
-        return;
 }
 
 
@@ -366,7 +365,7 @@ static void atl1c_tx_timeout(struct net_device *netdev)
         struct atl1c_adapter *adapter = netdev_priv(netdev);
 
         /* Do the reset outside of interrupt context */
-        adapter->work_event |= ATL1C_WORK_EVENT_RESET;
+        set_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event);
         schedule_work(&adapter->common_task);
 }
 
@@ -481,6 +480,15 @@ static void atl1c_set_rxbufsize(struct atl1c_adapter *adapter,
         adapter->rx_buffer_len = mtu > AT_RX_BUF_SIZE ?
                 roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE;
 }
+
+static u32 atl1c_fix_features(struct net_device *netdev, u32 features)
+{
+        if (netdev->mtu > MAX_TSO_FRAME_SIZE)
+                features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+
+        return features;
+}
+
 /*
  * atl1c_change_mtu - Change the Maximum Transfer Unit
  * @netdev: network interface device structure
@@ -507,14 +515,8 @@ static int atl1c_change_mtu(struct net_device *netdev, int new_mtu)
                 netdev->mtu = new_mtu;
                 adapter->hw.max_frame_size = new_mtu;
                 atl1c_set_rxbufsize(adapter, netdev);
-                if (new_mtu > MAX_TSO_FRAME_SIZE) {
-                        adapter->netdev->features &= ~NETIF_F_TSO;
-                        adapter->netdev->features &= ~NETIF_F_TSO6;
-                } else {
-                        adapter->netdev->features |= NETIF_F_TSO;
-                        adapter->netdev->features |= NETIF_F_TSO6;
-                }
                 atl1c_down(adapter);
+                netdev_update_features(netdev);
                 atl1c_up(adapter);
                 clear_bit(__AT_RESETTING, &adapter->flags);
                 if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) {
@@ -700,6 +702,7 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
 
 
         adapter->wol = 0;
+        device_set_wakeup_enable(&pdev->dev, false);
         adapter->link_speed = SPEED_0;
         adapter->link_duplex = FULL_DUPLEX;
         adapter->num_rx_queues = AT_DEF_RECEIVE_QUEUE;
@@ -1088,20 +1091,18 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
         u32 max_pay_load;
         u16 tx_offload_thresh;
         u32 txq_ctrl_data;
-        u32 extra_size = 0;     /* Jumbo frame threshold in QWORD unit */
         u32 max_pay_load_data;
 
-        extra_size = ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN;
         tx_offload_thresh = MAX_TX_OFFLOAD_THRESH;
         AT_WRITE_REG(hw, REG_TX_TSO_OFFLOAD_THRESH,
                 (tx_offload_thresh >> 3) & TX_TSO_OFFLOAD_THRESH_MASK);
         AT_READ_REG(hw, REG_DEVICE_CTRL, &dev_ctrl_data);
         max_pay_load  = (dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT) &
                         DEVICE_CTRL_MAX_PAYLOAD_MASK;
-        hw->dmaw_block = min(max_pay_load, hw->dmaw_block);
+        hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block);
         max_pay_load  = (dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT) &
                         DEVICE_CTRL_MAX_RREQ_SZ_MASK;
-        hw->dmar_block = min(max_pay_load, hw->dmar_block);
+        hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block);
 
         txq_ctrl_data = (hw->tpd_burst & TXQ_NUM_TPD_BURST_MASK) <<
                         TXQ_NUM_TPD_BURST_SHIFT;
@@ -1562,7 +1563,7 @@ static struct net_device_stats *atl1c_get_stats(struct net_device *netdev)
 {
         struct atl1c_adapter *adapter = netdev_priv(netdev);
         struct atl1c_hw_stats  *hw_stats = &adapter->hw_stats;
-        struct net_device_stats *net_stats = &adapter->net_stats;
+        struct net_device_stats *net_stats = &netdev->stats;
 
         atl1c_update_hw_stats(adapter);
         net_stats->rx_packets = hw_stats->rx_ok;
@@ -1590,7 +1591,7 @@ static struct net_device_stats *atl1c_get_stats(struct net_device *netdev)
         net_stats->tx_aborted_errors = hw_stats->tx_abort_col;
         net_stats->tx_window_errors  = hw_stats->tx_late_col;
 
-        return &adapter->net_stats;
+        return net_stats;
 }
 
 static inline void atl1c_clear_phy_int(struct atl1c_adapter *adapter)
@@ -1700,7 +1701,7 @@ static irqreturn_t atl1c_intr(int irq, void *data)
 
                 /* link event */
                 if (status & (ISR_GPHY | ISR_MANUAL)) {
-                        adapter->net_stats.tx_carrier_errors++;
+                        netdev->stats.tx_carrier_errors++;
                         atl1c_link_chg_event(adapter);
                         break;
                 }
@@ -1719,7 +1720,7 @@ static inline void atl1c_rx_checksum(struct atl1c_adapter *adapter,
          * cannot figure out if the packet is fragmented or not,
          * so we tell the KERNEL CHECKSUM_NONE
          */
-        skb->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb);
 }
 
 static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, const int ringid)
@@ -2076,7 +2077,7 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,
 check_sum:
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 u8 css, cso;
-                cso = skb_transport_offset(skb);
+                cso = skb_checksum_start_offset(skb);
 
                 if (unlikely(cso & 0x1)) {
                         if (netif_msg_tx_err(adapter))
@@ -2243,7 +2244,7 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
                 return NETDEV_TX_OK;
         }
 
-        if (unlikely(adapter->vlgrp && vlan_tx_tag_present(skb))) {
+        if (unlikely(vlan_tx_tag_present(skb))) {
                 u16 vlan = vlan_tx_tag_get(skb);
                 __le16 tag;
 
@@ -2309,7 +2310,7 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter)
         return err;
 }
 
-int atl1c_up(struct atl1c_adapter *adapter)
+static int atl1c_up(struct atl1c_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
         int num;
@@ -2351,7 +2352,7 @@ err_alloc_rx:
         return err;
 }
 
-void atl1c_down(struct atl1c_adapter *adapter)
+static void atl1c_down(struct atl1c_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
 
@@ -2442,8 +2443,9 @@ static int atl1c_close(struct net_device *netdev)
         return 0;
 }
 
-static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
+static int atl1c_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1c_adapter *adapter = netdev_priv(netdev);
         struct atl1c_hw *hw = &adapter->hw;
@@ -2452,7 +2454,6 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
         u32 wol_ctrl_data = 0;
         u16 mii_intr_status_data = 0;
         u32 wufc = adapter->wol;
-        int retval = 0;
 
         atl1c_disable_l0s_l1(hw);
         if (netif_running(netdev)) {
@@ -2460,9 +2461,6 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
                 atl1c_down(adapter);
         }
         netif_device_detach(netdev);
-        retval = pci_save_state(pdev);
-        if (retval)
-                return retval;
 
         if (wufc)
                 if (atl1c_phy_power_saving(hw) != 0)
@@ -2523,12 +2521,8 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
                 AT_WRITE_REG(hw, REG_WOL_CTRL, wol_ctrl_data);
                 AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
 
-                /* pcie patch */
-                device_set_wakeup_enable(&pdev->dev, 1);
-
                 AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_DEFAULT |
                         GPHY_CTRL_EXT_RESET);
-                pci_prepare_to_sleep(pdev);
         } else {
                 AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_POWER_SAVING);
                 master_ctrl_data |= MASTER_CTRL_CLK_SEL_DIS;
@@ -2538,25 +2532,18 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
                 AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
                 AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
                 hw->phy_configured = false; /* re-init PHY when resume */
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
         }
 
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
         return 0;
 }
 
-static int atl1c_resume(struct pci_dev *pdev)
+#ifdef CONFIG_PM_SLEEP
+static int atl1c_resume(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1c_adapter *adapter = netdev_priv(netdev);
 
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-        pci_enable_wake(pdev, PCI_D3hot, 0);
-        pci_enable_wake(pdev, PCI_D3cold, 0);
-
         AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0);
         atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE |
                         ATL1C_PCIE_PHY_RESET);
@@ -2577,10 +2564,16 @@ static int atl1c_resume(struct pci_dev *pdev)
 
         return 0;
 }
+#endif
 
 static void atl1c_shutdown(struct pci_dev *pdev)
 {
-        atl1c_suspend(pdev, PMSG_SUSPEND);
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct atl1c_adapter *adapter = netdev_priv(netdev);
+
+        atl1c_suspend(&pdev->dev);
+        pci_wake_from_d3(pdev, adapter->wol);
+        pci_set_power_state(pdev, PCI_D3hot);
 }
 
 static const struct net_device_ops atl1c_netdev_ops = {
@@ -2591,6 +2584,7 @@ static const struct net_device_ops atl1c_netdev_ops = {
         .ndo_set_mac_address    = atl1c_set_mac_addr,
         .ndo_set_multicast_list = atl1c_set_multi,
         .ndo_change_mtu         = atl1c_change_mtu,
+        .ndo_fix_features       = atl1c_fix_features,
         .ndo_do_ioctl           = atl1c_ioctl,
         .ndo_tx_timeout         = atl1c_tx_timeout,
         .ndo_get_stats          = atl1c_get_stats,
@@ -2611,12 +2605,13 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         atl1c_set_ethtool_ops(netdev);
 
         /* TODO: add when ready */
-        netdev->features =      NETIF_F_SG         |
+        netdev->hw_features =   NETIF_F_SG         |
                                 NETIF_F_HW_CSUM    |
                                 NETIF_F_HW_VLAN_TX |
-                                NETIF_F_HW_VLAN_RX |
                                 NETIF_F_TSO        |
                                 NETIF_F_TSO6;
+        netdev->features =      netdev->hw_features |
+                                NETIF_F_HW_VLAN_RX;
         return 0;
 }
 
@@ -2724,7 +2719,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
                 goto err_reset;
         }
 
-        device_init_wakeup(&pdev->dev, 1);
         /* reset the controller to
          * put the device in a known good starting state */
         err = atl1c_phy_init(&adapter->hw);
@@ -2884,16 +2878,16 @@ static struct pci_error_handlers atl1c_err_handler = {
         .resume = atl1c_io_resume,
 };
 
+static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
+
 static struct pci_driver atl1c_driver = {
         .name     = atl1c_driver_name,
         .id_table = atl1c_pci_tbl,
         .probe    = atl1c_probe,
         .remove   = __devexit_p(atl1c_remove),
-        /* Power Managment Hooks */
-        .suspend  = atl1c_suspend,
-        .resume   = atl1c_resume,
         .shutdown = atl1c_shutdown,
-        .err_handler = &atl1c_err_handler
+        .err_handler = &atl1c_err_handler,
+        .driver.pm = &atl1c_pm_ops,
 };
 
 /*