244 files changed, 6967 insertions, 3177 deletions

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 82eaf65d2d8..ea9b7a098c9 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -551,8 +551,7 @@ static irqreturn_t el16_interrupt(int irq, void *dev_id)
         void __iomem *shmem;
 
         if (dev == NULL) {
-                pr_err("%s: net_interrupt(): irq %d for unknown device.\n",
-                        dev->name, irq);
+                pr_err("net_interrupt(): irq %d for unknown device.\n", irq);
                 return IRQ_NONE;
         }
 
diff --git a/drivers/net/3c527.h b/drivers/net/3c527.h
index 75e28fef797..d693b8d15cd 100644
--- a/drivers/net/3c527.h
+++ b/drivers/net/3c527.h
@@ -34,7 +34,7 @@ struct mc32_mailbox
 {
         u16 mbox;
         u16 data[1];
-} __attribute((packed));
+} __packed;
 
 struct skb_header
 {
@@ -43,7 +43,7 @@ struct skb_header
         u16 next;       /* Do not change! */
         u16 length;
         u32 data;
-} __attribute((packed));
+} __packed;
 
 struct mc32_stats
 {
@@ -68,7 +68,7 @@ struct mc32_stats
         u32 dataA[6];
         u16 dataB[5];
         u32 dataC[14];
-} __attribute((packed));
+} __packed;
 
 #define STATUS_MASK     0x0F
 #define COMPLETED       (1<<7)
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 9c149750e2b..4a4f6b81e32 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -322,7 +322,7 @@ struct cp_dma_stats {
         __le32                  rx_ok_mcast;
         __le16                  tx_abort;
         __le16                  tx_underrun;
-} __attribute__((packed));
+} __packed;
 
 struct cp_extra_stats {
         unsigned long           rx_frags;
@@ -598,8 +598,8 @@ rx_next:
                         goto rx_status_loop;
 
                 spin_lock_irqsave(&cp->lock, flags);
-                cpw16_f(IntrMask, cp_intr_mask);
                 __napi_complete(napi);
+                cpw16_f(IntrMask, cp_intr_mask);
                 spin_unlock_irqrestore(&cp->lock, flags);
         }
 
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 4ba72933f0d..f5166dccd8d 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -662,7 +662,7 @@ static const struct ethtool_ops rtl8139_ethtool_ops;
 /* read MMIO register */
 #define RTL_R8(reg)             ioread8 (ioaddr + (reg))
 #define RTL_R16(reg)            ioread16 (ioaddr + (reg))
-#define RTL_R32(reg)            ((unsigned long) ioread32 (ioaddr + (reg)))
+#define RTL_R32(reg)            ioread32 (ioaddr + (reg))
 
 
 static const u16 rtl8139_intr_mask =
@@ -860,8 +860,9 @@ retry:
                 }
 
         /* if unknown chip, assume array element #0, original RTL-8139 in this case */
+        i = 0;
         dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n");
-        dev_dbg(&pdev->dev, "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));
+        dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig));
         tp->chipset = 0;
 
 match:
@@ -1642,7 +1643,7 @@ static void rtl8139_tx_timeout_task (struct work_struct *work)
         netdev_dbg(dev, "Tx queue start entry %ld  dirty entry %ld\n",
                    tp->cur_tx, tp->dirty_tx);
         for (i = 0; i < NUM_TX_DESC; i++)
-                netdev_dbg(dev, "Tx descriptor %d is %08lx%s\n",
+                netdev_dbg(dev, "Tx descriptor %d is %08x%s\n",
                            i, RTL_R32(TxStatus0 + (i * 4)),
                            i == tp->dirty_tx % NUM_TX_DESC ?
                            " (queue head)" : "");
@@ -2088,8 +2089,8 @@ static int rtl8139_poll(struct napi_struct *napi, int budget)
                  * again when we think we are done.
                  */
                 spin_lock_irqsave(&tp->lock, flags);
-                RTL_W16_F(IntrMask, rtl8139_intr_mask);
                 __napi_complete(napi);
+                RTL_W16_F(IntrMask, rtl8139_intr_mask);
                 spin_unlock_irqrestore(&tp->lock, flags);
         }
         spin_unlock(&tp->rx_lock);
@@ -2486,7 +2487,7 @@ static void __set_rx_mode (struct net_device *dev)
         int rx_mode;
         u32 tmp;
 
-        netdev_dbg(dev, "rtl8139_set_rx_mode(%04x) done -- Rx config %08lx\n",
+        netdev_dbg(dev, "rtl8139_set_rx_mode(%04x) done -- Rx config %08x\n",
                    dev->flags, RTL_R32(RxConfig));
 
         /* Note: do not reorder, GCC is clever about common statements. */
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2decc597bda..fe113d0e945 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1659,6 +1659,7 @@ config R6040
         depends on NET_PCI && PCI
         select CRC32
         select MII
+        select PHYLIB
         help
           This is a driver for the R6040 Fast Ethernet MACs found in the
           the RDC R-321x System-on-chips.
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index 355797f7004..42fce91b71f 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -37,69 +37,6 @@
 
 #define VERSION "arcnet: cap mode (`c') encapsulation support loaded.\n"
 
-
-static void rx(struct net_device *dev, int bufnum,
-               struct archdr *pkthdr, int length);
-static int build_header(struct sk_buff *skb,
-                        struct net_device *dev,
-                        unsigned short type,
-                        uint8_t daddr);
-static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
-                      int bufnum);
-static int ack_tx(struct net_device *dev, int acked);
-
-
-static struct ArcProto capmode_proto =
-{
-        'r',
-        XMTU,
-        0,
-        rx,
-        build_header,
-        prepare_tx,
-        NULL,
-        ack_tx
-};
-
-
-static void arcnet_cap_init(void)
-{
-        int count;
-
-        for (count = 1; count <= 8; count++)
-                if (arc_proto_map[count] == arc_proto_default)
-                        arc_proto_map[count] = &capmode_proto;
-
-        /* for cap mode, we only set the bcast proto if there's no better one */
-        if (arc_bcast_proto == arc_proto_default)
-                arc_bcast_proto = &capmode_proto;
-
-        arc_proto_default = &capmode_proto;
-        arc_raw_proto = &capmode_proto;
-}
-
-
-#ifdef MODULE
-
-static int __init capmode_module_init(void)
-{
-        printk(VERSION);
-        arcnet_cap_init();
-        return 0;
-}
-
-static void __exit capmode_module_exit(void)
-{
-        arcnet_unregister_proto(&capmode_proto);
-}
-module_init(capmode_module_init);
-module_exit(capmode_module_exit);
-
-MODULE_LICENSE("GPL");
-#endif                          /* MODULE */
-
-
-
 /* packet receiver */
 static void rx(struct net_device *dev, int bufnum,
                struct archdr *pkthdr, int length)
@@ -231,65 +168,107 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
         BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",
                length,ofs);
 
-        // Copy the arcnet-header + the protocol byte down:
+        /* Copy the arcnet-header + the protocol byte down: */
         lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE);
         lp->hw.copy_to_card(dev, bufnum, ofs, &pkt->soft.cap.proto,
                             sizeof(pkt->soft.cap.proto));
 
-        // Skip the extra integer we have written into it as a cookie
-        // but write the rest of the message:
+        /* Skip the extra integer we have written into it as a cookie
+           but write the rest of the message: */
         lp->hw.copy_to_card(dev, bufnum, ofs+1,
                             ((unsigned char*)&pkt->soft.cap.mes),length-1);
 
         lp->lastload_dest = hard->dest;
 
-        return 1;               /* done */
+        return 1;       /* done */
 }
 
-
 static int ack_tx(struct net_device *dev, int acked)
 {
-  struct arcnet_local *lp = netdev_priv(dev);
-  struct sk_buff *ackskb;
-  struct archdr *ackpkt;
-  int length=sizeof(struct arc_cap);
+        struct arcnet_local *lp = netdev_priv(dev);
+        struct sk_buff *ackskb;
+        struct archdr *ackpkt;
+        int length=sizeof(struct arc_cap);
 
-  BUGMSG(D_DURING, "capmode: ack_tx: protocol: %x: result: %d\n",
-         lp->outgoing.skb->protocol, acked);
+        BUGMSG(D_DURING, "capmode: ack_tx: protocol: %x: result: %d\n",
+                lp->outgoing.skb->protocol, acked);
 
-  BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx");
+        BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx");
 
-  /* Now alloc a skb to send back up through the layers: */
-  ackskb = alloc_skb(length + ARC_HDR_SIZE , GFP_ATOMIC);
-  if (ackskb == NULL) {
-          BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n");
-          goto free_outskb;
-  }
+        /* Now alloc a skb to send back up through the layers: */
+        ackskb = alloc_skb(length + ARC_HDR_SIZE , GFP_ATOMIC);
+        if (ackskb == NULL) {
+                BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n");
+                goto free_outskb;
+        }
+
+        skb_put(ackskb, length + ARC_HDR_SIZE );
+        ackskb->dev = dev;
+
+        skb_reset_mac_header(ackskb);
+        ackpkt = (struct archdr *)skb_mac_header(ackskb);
+        /* skb_pull(ackskb, ARC_HDR_SIZE); */
 
-  skb_put(ackskb, length + ARC_HDR_SIZE );
-  ackskb->dev = dev;
+        skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,
+                                  ARC_HDR_SIZE + sizeof(struct arc_cap));
+        ackpkt->soft.cap.proto = 0; /* using protocol 0 for acknowledge */
+        ackpkt->soft.cap.mes.ack=acked;
 
-  skb_reset_mac_header(ackskb);
-  ackpkt = (struct archdr *)skb_mac_header(ackskb);
-  /* skb_pull(ackskb, ARC_HDR_SIZE); */
+        BUGMSG(D_PROTO, "Ackknowledge for cap packet %x.\n",
+                        *((int*)&ackpkt->soft.cap.cookie[0]));
 
+        ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
 
-  skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,
-                ARC_HDR_SIZE + sizeof(struct arc_cap));
-  ackpkt->soft.cap.proto=0; /* using protocol 0 for acknowledge */
-  ackpkt->soft.cap.mes.ack=acked;
+        BUGLVL(D_SKB) arcnet_dump_skb(dev, ackskb, "ack_tx_recv");
+        netif_rx(ackskb);
 
-  BUGMSG(D_PROTO, "Ackknowledge for cap packet %x.\n",
-         *((int*)&ackpkt->soft.cap.cookie[0]));
+free_outskb:
+        dev_kfree_skb_irq(lp->outgoing.skb);
+        lp->outgoing.proto = NULL; /* We are always finished when in this protocol */
 
-  ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
+        return 0;
+}
 
-  BUGLVL(D_SKB) arcnet_dump_skb(dev, ackskb, "ack_tx_recv");
-  netif_rx(ackskb);
+static struct ArcProto capmode_proto =
+{
+        'r',
+        XMTU,
+        0,
+        rx,
+        build_header,
+        prepare_tx,
+        NULL,
+        ack_tx
+};
 
- free_outskb:
-  dev_kfree_skb_irq(lp->outgoing.skb);
-  lp->outgoing.proto = NULL; /* We are always finished when in this protocol */
+static void arcnet_cap_init(void)
+{
+        int count;
 
-  return 0;
+        for (count = 1; count <= 8; count++)
+                if (arc_proto_map[count] == arc_proto_default)
+                        arc_proto_map[count] = &capmode_proto;
+
+        /* for cap mode, we only set the bcast proto if there's no better one */
+        if (arc_bcast_proto == arc_proto_default)
+                arc_bcast_proto = &capmode_proto;
+
+        arc_proto_default = &capmode_proto;
+        arc_raw_proto = &capmode_proto;
 }
+
+static int __init capmode_module_init(void)
+{
+        printk(VERSION);
+        arcnet_cap_init();
+        return 0;
+}
+
+static void __exit capmode_module_exit(void)
+{
+        arcnet_unregister_proto(&capmode_proto);
+}
+module_init(capmode_module_init);
+module_exit(capmode_module_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 24df0325090..ee2f8425dbe 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -738,6 +738,17 @@ static void eth_set_mcast_list(struct net_device *dev)
         struct netdev_hw_addr *ha;
         u8 diffs[ETH_ALEN], *addr;
         int i;
+        static const u8 allmulti[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+        if (dev->flags & IFF_ALLMULTI) {
+                for (i = 0; i < ETH_ALEN; i++) {
+                        __raw_writel(allmulti[i], &port->regs->mcast_addr[i]);
+                        __raw_writel(allmulti[i], &port->regs->mcast_mask[i]);
+                }
+                __raw_writel(DEFAULT_RX_CNTRL0 | RX_CNTRL0_ADDR_FLTR_EN,
+                        &port->regs->rx_control[0]);
+                return;
+        }
 
         if ((dev->flags & IFF_PROMISC) || netdev_mc_empty(dev)) {
                 __raw_writel(DEFAULT_RX_CNTRL0 & ~RX_CNTRL0_ADDR_FLTR_EN,
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h
index 84ae905bf73..52abbbdf8a0 100644
--- a/drivers/net/atl1c/atl1c.h
+++ b/drivers/net/atl1c/atl1c.h
@@ -73,7 +73,8 @@
 #define FULL_DUPLEX        2
 
 #define AT_RX_BUF_SIZE          (ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN)
-#define MAX_JUMBO_FRAME_SIZE    (9*1024)
+#define MAX_JUMBO_FRAME_SIZE    (6*1024)
+#define MAX_TSO_FRAME_SIZE      (7*1024)
 #define MAX_TX_OFFLOAD_THRESH   (9*1024)
 
 #define AT_MAX_RECEIVE_QUEUE    4
@@ -87,10 +88,11 @@
 #define AT_MAX_INT_WORK         5
 #define AT_TWSI_EEPROM_TIMEOUT  100
 #define AT_HW_MAX_IDLE_DELAY    10
-#define AT_SUSPEND_LINK_TIMEOUT 28
+#define AT_SUSPEND_LINK_TIMEOUT 100
 
 #define AT_ASPM_L0S_TIMER       6
 #define AT_ASPM_L1_TIMER        12
+#define AT_LCKDET_TIMER         12
 
 #define ATL1C_PCIE_L0S_L1_DISABLE       0x01
 #define ATL1C_PCIE_PHY_RESET            0x02
@@ -316,6 +318,7 @@ enum atl1c_nic_type {
         athr_l2c_b,
         athr_l2c_b2,
         athr_l1d,
+        athr_l1d_2,
 };
 
 enum atl1c_trans_queue {
@@ -392,6 +395,8 @@ struct atl1c_hw {
         u16 subsystem_id;
         u16 subsystem_vendor_id;
         u8 revision_id;
+        u16 phy_id1;
+        u16 phy_id2;
 
         u32 intr_mask;
         u8 dmaw_dly_cnt;
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/atl1c/atl1c_hw.c
index f1389d664a2..d8501f06095 100644
--- a/drivers/net/atl1c/atl1c_hw.c
+++ b/drivers/net/atl1c/atl1c_hw.c
@@ -37,6 +37,9 @@ int atl1c_check_eeprom_exist(struct atl1c_hw *hw)
         if (data & TWSI_DEBUG_DEV_EXIST)
                 return 1;
 
+        AT_READ_REG(hw, REG_MASTER_CTRL, &data);
+        if (data & MASTER_CTRL_OTP_SEL)
+                return 1;
         return 0;
 }
 
@@ -69,6 +72,8 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
         u32 i;
         u32 otp_ctrl_data;
         u32 twsi_ctrl_data;
+        u32 ltssm_ctrl_data;
+        u32 wol_data;
         u8  eth_addr[ETH_ALEN];
         u16 phy_data;
         bool raise_vol = false;
@@ -104,6 +109,15 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
                         udelay(20);
                         raise_vol = true;
                 }
+                /* close open bit of ReadOnly*/
+                AT_READ_REG(hw, REG_LTSSM_ID_CTRL, &ltssm_ctrl_data);
+                ltssm_ctrl_data &= ~LTSSM_ID_EN_WRO;
+                AT_WRITE_REG(hw, REG_LTSSM_ID_CTRL, ltssm_ctrl_data);
+
+                /* clear any WOL settings */
+                AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
+                AT_READ_REG(hw, REG_WOL_CTRL, &wol_data);
+
 
                 AT_READ_REG(hw, REG_TWSI_CTRL, &twsi_ctrl_data);
                 twsi_ctrl_data |= TWSI_CTRL_SW_LDSTART;
@@ -119,17 +133,15 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
         }
         /* Disable OTP_CLK */
         if ((hw->nic_type == athr_l1c || hw->nic_type == athr_l2c)) {
-                if (otp_ctrl_data & OTP_CTRL_CLK_EN) {
-                        otp_ctrl_data &= ~OTP_CTRL_CLK_EN;
-                        AT_WRITE_REG(hw, REG_OTP_CTRL, otp_ctrl_data);
-                        AT_WRITE_FLUSH(hw);
-                        msleep(1);
-                }
+                otp_ctrl_data &= ~OTP_CTRL_CLK_EN;
+                AT_WRITE_REG(hw, REG_OTP_CTRL, otp_ctrl_data);
+                msleep(1);
         }
         if (raise_vol) {
                 if (hw->nic_type == athr_l2c_b ||
                     hw->nic_type == athr_l2c_b2 ||
-                    hw->nic_type == athr_l1d) {
+                    hw->nic_type == athr_l1d ||
+                    hw->nic_type == athr_l1d_2) {
                         atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x00);
                         if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data))
                                 goto out;
@@ -456,14 +468,22 @@ int atl1c_phy_reset(struct atl1c_hw *hw)
 
         if (hw->nic_type == athr_l2c_b ||
             hw->nic_type == athr_l2c_b2 ||
-            hw->nic_type == athr_l1d) {
+            hw->nic_type == athr_l1d ||
+            hw->nic_type == athr_l1d_2) {
                 atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x3B);
                 atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data);
                 atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data & 0xFFF7);
                 msleep(20);
         }
-
-        /*Enable PHY LinkChange Interrupt */
+        if (hw->nic_type == athr_l1d) {
+                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
+                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) {
+                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
+                atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
+        }
         err = atl1c_write_phy_reg(hw, MII_IER, mii_ier_data);
         if (err) {
                 if (netif_msg_hw(adapter))
@@ -482,12 +502,10 @@ int atl1c_phy_init(struct atl1c_hw *hw)
         struct pci_dev *pdev = adapter->pdev;
         int ret_val;
         u16 mii_bmcr_data = BMCR_RESET;
-        u16 phy_id1, phy_id2;
 
-        if ((atl1c_read_phy_reg(hw, MII_PHYSID1, &phy_id1) != 0) ||
-                (atl1c_read_phy_reg(hw, MII_PHYSID2, &phy_id2) != 0)) {
-                        if (netif_msg_link(adapter))
-                                dev_err(&pdev->dev, "Error get phy ID\n");
+        if ((atl1c_read_phy_reg(hw, MII_PHYSID1, &hw->phy_id1) != 0) ||
+                (atl1c_read_phy_reg(hw, MII_PHYSID2, &hw->phy_id2) != 0)) {
+                dev_err(&pdev->dev, "Error get phy ID\n");
                 return -1;
         }
         switch (hw->media_type) {
@@ -572,6 +590,65 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)
         return 0;
 }
 
+int atl1c_phy_power_saving(struct atl1c_hw *hw)
+{
+        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct pci_dev *pdev = adapter->pdev;
+        int ret = 0;
+        u16 autoneg_advertised = ADVERTISED_10baseT_Half;
+        u16 save_autoneg_advertised;
+        u16 phy_data;
+        u16 mii_lpa_data;
+        u16 speed = SPEED_0;
+        u16 duplex = FULL_DUPLEX;
+        int i;
+
+        atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+        atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+        if (phy_data & BMSR_LSTATUS) {
+                atl1c_read_phy_reg(hw, MII_LPA, &mii_lpa_data);
+                if (mii_lpa_data & LPA_10FULL)
+                        autoneg_advertised = ADVERTISED_10baseT_Full;
+                else if (mii_lpa_data & LPA_10HALF)
+                        autoneg_advertised = ADVERTISED_10baseT_Half;
+                else if (mii_lpa_data & LPA_100HALF)
+                        autoneg_advertised = ADVERTISED_100baseT_Half;
+                else if (mii_lpa_data & LPA_100FULL)
+                        autoneg_advertised = ADVERTISED_100baseT_Full;
+
+                save_autoneg_advertised = hw->autoneg_advertised;
+                hw->phy_configured = false;
+                hw->autoneg_advertised = autoneg_advertised;
+                if (atl1c_restart_autoneg(hw) != 0) {
+                        dev_dbg(&pdev->dev, "phy autoneg failed\n");
+                        ret = -1;
+                }
+                hw->autoneg_advertised = save_autoneg_advertised;
+
+                if (mii_lpa_data) {
+                        for (i = 0; i < AT_SUSPEND_LINK_TIMEOUT; i++) {
+                                mdelay(100);
+                                atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+                                atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
+                                if (phy_data & BMSR_LSTATUS) {
+                                        if (atl1c_get_speed_and_duplex(hw, &speed,
+                                                                        &duplex) != 0)
+                                                dev_dbg(&pdev->dev,
+                                                        "get speed and duplex failed\n");
+                                        break;
+                                }
+                        }
+                }
+        } else {
+                speed = SPEED_10;
+                duplex = HALF_DUPLEX;
+        }
+        adapter->link_speed = speed;
+        adapter->link_duplex = duplex;
+
+        return ret;
+}
+
 int atl1c_restart_autoneg(struct atl1c_hw *hw)
 {
         int err = 0;
diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/atl1c/atl1c_hw.h
index 1eeb3ed9f0c..3dd675979aa 100644
--- a/drivers/net/atl1c/atl1c_hw.h
+++ b/drivers/net/atl1c/atl1c_hw.h
@@ -42,7 +42,7 @@ bool atl1c_read_eeprom(struct atl1c_hw *hw, u32 offset, u32 *p_value);
 int atl1c_phy_init(struct atl1c_hw *hw);
 int atl1c_check_eeprom_exist(struct atl1c_hw *hw);
 int atl1c_restart_autoneg(struct atl1c_hw *hw);
-
+int atl1c_phy_power_saving(struct atl1c_hw *hw);
 /* register definition */
 #define REG_DEVICE_CAP                  0x5C
 #define DEVICE_CAP_MAX_PAYLOAD_MASK     0x7
@@ -120,6 +120,12 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define REG_PCIE_PHYMISC                0x1000
 #define PCIE_PHYMISC_FORCE_RCV_DET      0x4
 
+#define REG_PCIE_PHYMISC2               0x1004
+#define PCIE_PHYMISC2_SERDES_CDR_MASK   0x3
+#define PCIE_PHYMISC2_SERDES_CDR_SHIFT  16
+#define PCIE_PHYMISC2_SERDES_TH_MASK    0x3
+#define PCIE_PHYMISC2_SERDES_TH_SHIFT   18
+
 #define REG_TWSI_DEBUG                  0x1108
 #define TWSI_DEBUG_DEV_EXIST            0x20000000
 
@@ -150,24 +156,28 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define PM_CTRL_ASPM_L0S_EN             0x00001000
 #define PM_CTRL_CLK_SWH_L1              0x00002000
 #define PM_CTRL_CLK_PWM_VER1_1          0x00004000
-#define PM_CTRL_PCIE_RECV               0x00008000
+#define PM_CTRL_RCVR_WT_TIMER           0x00008000
 #define PM_CTRL_L1_ENTRY_TIMER_MASK     0xF
 #define PM_CTRL_L1_ENTRY_TIMER_SHIFT    16
 #define PM_CTRL_PM_REQ_TIMER_MASK       0xF
 #define PM_CTRL_PM_REQ_TIMER_SHIFT      20
-#define PM_CTRL_LCKDET_TIMER_MASK       0x3F
+#define PM_CTRL_LCKDET_TIMER_MASK       0xF
 #define PM_CTRL_LCKDET_TIMER_SHIFT      24
 #define PM_CTRL_EN_BUFS_RX_L0S          0x10000000
 #define PM_CTRL_SA_DLY_EN               0x20000000
 #define PM_CTRL_MAC_ASPM_CHK            0x40000000
 #define PM_CTRL_HOTRST                  0x80000000
 
+#define REG_LTSSM_ID_CTRL               0x12FC
+#define LTSSM_ID_EN_WRO                 0x1000
 /* Selene Master Control Register */
 #define REG_MASTER_CTRL                 0x1400
 #define MASTER_CTRL_SOFT_RST            0x1
 #define MASTER_CTRL_TEST_MODE_MASK      0x3
 #define MASTER_CTRL_TEST_MODE_SHIFT     2
 #define MASTER_CTRL_BERT_START          0x10
+#define MASTER_CTRL_OOB_DIS_OFF         0x40
+#define MASTER_CTRL_SA_TIMER_EN         0x80
 #define MASTER_CTRL_MTIMER_EN           0x100
 #define MASTER_CTRL_MANUAL_INT          0x200
 #define MASTER_CTRL_TX_ITIMER_EN        0x400
@@ -220,6 +230,12 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
                 GPHY_CTRL_PWDOWN_HW     |\
                 GPHY_CTRL_PHY_IDDQ)
 
+#define GPHY_CTRL_POWER_SAVING (        \
+                GPHY_CTRL_SEL_ANA_RST   |\
+                GPHY_CTRL_HIB_EN        |\
+                GPHY_CTRL_HIB_PULSE     |\
+                GPHY_CTRL_PWDOWN_HW     |\
+                GPHY_CTRL_PHY_IDDQ)
 /* Block IDLE Status Register */
 #define REG_IDLE_STATUS                 0x1410
 #define IDLE_STATUS_MASK                0x00FF
@@ -287,6 +303,14 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define SERDES_LOCK_DETECT              0x1  /* SerDes lock detected. This signal
                                               * comes from Analog SerDes */
 #define SERDES_LOCK_DETECT_EN           0x2  /* 1: Enable SerDes Lock detect function */
+#define SERDES_LOCK_STS_SELFB_PLL_SHIFT 0xE
+#define SERDES_LOCK_STS_SELFB_PLL_MASK  0x3
+#define SERDES_OVCLK_18_25              0x0
+#define SERDES_OVCLK_12_18              0x1
+#define SERDES_OVCLK_0_4                0x2
+#define SERDES_OVCLK_4_12               0x3
+#define SERDES_MAC_CLK_SLOWDOWN         0x20000
+#define SERDES_PYH_CLK_SLOWDOWN         0x40000
 
 /* MAC Control Register  */
 #define REG_MAC_CTRL                    0x1480
@@ -693,6 +717,21 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 #define REG_MAC_TX_STATUS_BIN           0x1760
 #define REG_MAC_TX_STATUS_END           0x17c0
 
+#define REG_CLK_GATING_CTRL             0x1814
+#define CLK_GATING_DMAW_EN              0x0001
+#define CLK_GATING_DMAR_EN              0x0002
+#define CLK_GATING_TXQ_EN               0x0004
+#define CLK_GATING_RXQ_EN               0x0008
+#define CLK_GATING_TXMAC_EN             0x0010
+#define CLK_GATING_RXMAC_EN             0x0020
+
+#define CLK_GATING_EN_ALL       (CLK_GATING_DMAW_EN |\
+                                 CLK_GATING_DMAR_EN |\
+                                 CLK_GATING_TXQ_EN  |\
+                                 CLK_GATING_RXQ_EN  |\
+                                 CLK_GATING_TXMAC_EN|\
+                                 CLK_GATING_RXMAC_EN)
+
 /* DEBUG ADDR */
 #define REG_DEBUG_DATA0                 0x1900
 #define REG_DEBUG_DATA1                 0x1904
@@ -734,6 +773,10 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw);
 
 #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
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 1c3c046d5f3..c7b8ef507eb 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -21,7 +21,7 @@
 
 #include "atl1c.h"
 
-#define ATL1C_DRV_VERSION "1.0.0.2-NAPI"
+#define ATL1C_DRV_VERSION "1.0.1.0-NAPI"
 char atl1c_driver_name[] = "atl1c";
 char atl1c_driver_version[] = ATL1C_DRV_VERSION;
 #define PCI_DEVICE_ID_ATTANSIC_L2C      0x1062
@@ -29,7 +29,7 @@ char atl1c_driver_version[] = ATL1C_DRV_VERSION;
 #define PCI_DEVICE_ID_ATHEROS_L2C_B     0x2060 /* AR8152 v1.1 Fast 10/100 */
 #define PCI_DEVICE_ID_ATHEROS_L2C_B2    0x2062 /* AR8152 v2.0 Fast 10/100 */
 #define PCI_DEVICE_ID_ATHEROS_L1D       0x1073 /* AR8151 v1.0 Gigabit 1000 */
-
+#define PCI_DEVICE_ID_ATHEROS_L1D_2_0   0x1083 /* AR8151 v2.0 Gigabit 1000 */
 #define L2CB_V10                        0xc0
 #define L2CB_V11                        0xc1
 
@@ -97,7 +97,28 @@ static const u16 atl1c_rrd_addr_lo_regs[AT_MAX_RECEIVE_QUEUE] =
 
 static const u32 atl1c_default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |
         NETIF_MSG_LINK | NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP;
+static void atl1c_pcie_patch(struct atl1c_hw *hw)
+{
+        u32 data;
 
+        AT_READ_REG(hw, REG_PCIE_PHYMISC, &data);
+        data |= PCIE_PHYMISC_FORCE_RCV_DET;
+        AT_WRITE_REG(hw, REG_PCIE_PHYMISC, data);
+
+        if (hw->nic_type == athr_l2c_b && hw->revision_id == L2CB_V10) {
+                AT_READ_REG(hw, REG_PCIE_PHYMISC2, &data);
+
+                data &= ~(PCIE_PHYMISC2_SERDES_CDR_MASK <<
+                        PCIE_PHYMISC2_SERDES_CDR_SHIFT);
+                data |= 3 << PCIE_PHYMISC2_SERDES_CDR_SHIFT;
+                data &= ~(PCIE_PHYMISC2_SERDES_TH_MASK <<
+                        PCIE_PHYMISC2_SERDES_TH_SHIFT);
+                data |= 3 << PCIE_PHYMISC2_SERDES_TH_SHIFT;
+                AT_WRITE_REG(hw, REG_PCIE_PHYMISC2, data);
+        }
+}
+
+/* FIXME: no need any more ? */
 /*
  * atl1c_init_pcie - init PCIE module
  */
@@ -127,6 +148,11 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
         data &= ~PCIE_UC_SERVRITY_FCP;
         AT_WRITE_REG(hw, REG_PCIE_UC_SEVERITY, data);
 
+        AT_READ_REG(hw, REG_LTSSM_ID_CTRL, &data);
+        data &= ~LTSSM_ID_EN_WRO;
+        AT_WRITE_REG(hw, REG_LTSSM_ID_CTRL, data);
+
+        atl1c_pcie_patch(hw);
         if (flag & ATL1C_PCIE_L0S_L1_DISABLE)
                 atl1c_disable_l0s_l1(hw);
         if (flag & ATL1C_PCIE_PHY_RESET)
@@ -135,7 +161,7 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
                 AT_WRITE_REG(hw, REG_GPHY_CTRL,
                         GPHY_CTRL_DEFAULT | GPHY_CTRL_EXT_RESET);
 
-        msleep(1);
+        msleep(5);
 }
 
 /*
@@ -159,6 +185,7 @@ static inline void atl1c_irq_disable(struct atl1c_adapter *adapter)
 {
         atomic_inc(&adapter->irq_sem);
         AT_WRITE_REG(&adapter->hw, REG_IMR, 0);
+        AT_WRITE_REG(&adapter->hw, REG_ISR, ISR_DIS_INT);
         AT_WRITE_FLUSH(&adapter->hw);
         synchronize_irq(adapter->pdev->irq);
 }
@@ -231,15 +258,15 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
 
         if ((phy_data & BMSR_LSTATUS) == 0) {
                 /* link down */
-                if (netif_carrier_ok(netdev)) {
-                        hw->hibernate = true;
-                        if (atl1c_stop_mac(hw) != 0)
-                                if (netif_msg_hw(adapter))
-                                        dev_warn(&pdev->dev,
-                                                "stop mac failed\n");
-                        atl1c_set_aspm(hw, false);
-                }
+                hw->hibernate = true;
+                if (atl1c_stop_mac(hw) != 0)
+                        if (netif_msg_hw(adapter))
+                                dev_warn(&pdev->dev, "stop mac failed\n");
+                atl1c_set_aspm(hw, false);
                 netif_carrier_off(netdev);
+                netif_stop_queue(netdev);
+                atl1c_phy_reset(hw);
+                atl1c_phy_init(&adapter->hw);
         } else {
                 /* Link Up */
                 hw->hibernate = false;
@@ -308,6 +335,7 @@ static void atl1c_common_task(struct work_struct *work)
         netdev = adapter->netdev;
 
         if (adapter->work_event & ATL1C_WORK_EVENT_RESET) {
+                adapter->work_event &= ~ATL1C_WORK_EVENT_RESET;
                 netif_device_detach(netdev);
                 atl1c_down(adapter);
                 atl1c_up(adapter);
@@ -315,8 +343,11 @@ static void atl1c_common_task(struct work_struct *work)
                 return;
         }
 
-        if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE)
+        if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE) {
+                adapter->work_event &= ~ATL1C_WORK_EVENT_LINK_CHANGE;
                 atl1c_check_link_status(adapter);
+        }
+        return;
 }
 
 
@@ -476,6 +507,13 @@ 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);
                 atl1c_up(adapter);
                 clear_bit(__AT_RESETTING, &adapter->flags);
@@ -613,6 +651,9 @@ static void atl1c_set_mac_type(struct atl1c_hw *hw)
         case PCI_DEVICE_ID_ATHEROS_L1D:
                 hw->nic_type = athr_l1d;
                 break;
+        case PCI_DEVICE_ID_ATHEROS_L1D_2_0:
+                hw->nic_type = athr_l1d_2;
+                break;
         default:
                 break;
         }
@@ -627,9 +668,7 @@ static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
         AT_READ_REG(hw, REG_PHY_STATUS, &phy_status_data);
         AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
 
-        hw->ctrl_flags = ATL1C_INTR_CLEAR_ON_READ |
-                         ATL1C_INTR_MODRT_ENABLE  |
-                         ATL1C_RX_IPV6_CHKSUM     |
+        hw->ctrl_flags = ATL1C_INTR_MODRT_ENABLE  |
                          ATL1C_TXQ_MODE_ENHANCE;
         if (link_ctrl_data & LINK_CTRL_L0S_EN)
                 hw->ctrl_flags |= ATL1C_ASPM_L0S_SUPPORT;
@@ -637,12 +676,12 @@ static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
                 hw->ctrl_flags |= ATL1C_ASPM_L1_SUPPORT;
         if (link_ctrl_data & LINK_CTRL_EXT_SYNC)
                 hw->ctrl_flags |= ATL1C_LINK_EXT_SYNC;
+        hw->ctrl_flags |= ATL1C_ASPM_CTRL_MON;
 
         if (hw->nic_type == athr_l1c ||
-            hw->nic_type == athr_l1d) {
-                hw->ctrl_flags |= ATL1C_ASPM_CTRL_MON;
+            hw->nic_type == athr_l1d ||
+            hw->nic_type == athr_l1d_2)
                 hw->link_cap_flags |= ATL1C_LINK_CAP_1000M;
-        }
         return 0;
 }
 /*
@@ -657,6 +696,8 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
 {
         struct atl1c_hw *hw   = &adapter->hw;
         struct pci_dev  *pdev = adapter->pdev;
+        u32 revision;
+
 
         adapter->wol = 0;
         adapter->link_speed = SPEED_0;
@@ -669,7 +710,8 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_id = pdev->subsystem_device;
-
+        AT_READ_REG(hw, PCI_CLASS_REVISION, &revision);
+        hw->revision_id = revision & 0xFF;
         /* before link up, we assume hibernate is true */
         hw->hibernate = true;
         hw->media_type = MEDIA_TYPE_AUTO_SENSOR;
@@ -974,6 +1016,7 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
         struct atl1c_cmb *cmb = (struct atl1c_cmb *) &adapter->cmb;
         struct atl1c_smb *smb = (struct atl1c_smb *) &adapter->smb;
         int i;
+        u32 data;
 
         /* TPD */
         AT_WRITE_REG(hw, REG_TX_BASE_ADDR_HI,
@@ -1017,6 +1060,23 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
                         (u32)((smb->dma & AT_DMA_HI_ADDR_MASK) >> 32));
         AT_WRITE_REG(hw, REG_SMB_BASE_ADDR_LO,
                         (u32)(smb->dma & AT_DMA_LO_ADDR_MASK));
+        if (hw->nic_type == athr_l2c_b) {
+                AT_WRITE_REG(hw, REG_SRAM_RXF_LEN, 0x02a0L);
+                AT_WRITE_REG(hw, REG_SRAM_TXF_LEN, 0x0100L);
+                AT_WRITE_REG(hw, REG_SRAM_RXF_ADDR, 0x029f0000L);
+                AT_WRITE_REG(hw, REG_SRAM_RFD0_INFO, 0x02bf02a0L);
+                AT_WRITE_REG(hw, REG_SRAM_TXF_ADDR, 0x03bf02c0L);
+                AT_WRITE_REG(hw, REG_SRAM_TRD_ADDR, 0x03df03c0L);
+                AT_WRITE_REG(hw, REG_TXF_WATER_MARK, 0);        /* TX watermark, to enter l1 state.*/
+                AT_WRITE_REG(hw, REG_RXD_DMA_CTRL, 0);          /* RXD threshold.*/
+        }
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d_2) {
+                        /* Power Saving for L2c_B */
+                AT_READ_REG(hw, REG_SERDES_LOCK, &data);
+                data |= SERDES_MAC_CLK_SLOWDOWN;
+                data |= SERDES_PYH_CLK_SLOWDOWN;
+                AT_WRITE_REG(hw, REG_SERDES_LOCK, data);
+        }
         /* Load all of base address above */
         AT_WRITE_REG(hw, REG_LOAD_PTR, 1);
 }
@@ -1029,6 +1089,7 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
         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;
@@ -1046,8 +1107,11 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
                         TXQ_NUM_TPD_BURST_SHIFT;
         if (hw->ctrl_flags & ATL1C_TXQ_MODE_ENHANCE)
                 txq_ctrl_data |= TXQ_CTRL_ENH_MODE;
-        txq_ctrl_data |= (atl1c_pay_load_size[hw->dmar_block] &
+        max_pay_load_data = (atl1c_pay_load_size[hw->dmar_block] &
                         TXQ_TXF_BURST_NUM_MASK) << TXQ_TXF_BURST_NUM_SHIFT;
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2)
+                max_pay_load_data >>= 1;
+        txq_ctrl_data |= max_pay_load_data;
 
         AT_WRITE_REG(hw, REG_TXQ_CTRL, txq_ctrl_data);
 }
@@ -1078,7 +1142,7 @@ static void atl1c_configure_rx(struct atl1c_adapter *adapter)
         rxq_ctrl_data |= (hw->rss_hash_bits & RSS_HASH_BITS_MASK) <<
                         RSS_HASH_BITS_SHIFT;
         if (hw->ctrl_flags & ATL1C_ASPM_CTRL_MON)
-                rxq_ctrl_data |= (ASPM_THRUPUT_LIMIT_100M &
+                rxq_ctrl_data |= (ASPM_THRUPUT_LIMIT_1M &
                         ASPM_THRUPUT_LIMIT_MASK) << ASPM_THRUPUT_LIMIT_SHIFT;
 
         AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data);
@@ -1198,21 +1262,23 @@ static int atl1c_reset_mac(struct atl1c_hw *hw)
 {
         struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
-        int ret;
+        u32 master_ctrl_data = 0;
 
         AT_WRITE_REG(hw, REG_IMR, 0);
         AT_WRITE_REG(hw, REG_ISR, ISR_DIS_INT);
 
-        ret = atl1c_stop_mac(hw);
-        if (ret)
-                return ret;
+        atl1c_stop_mac(hw);
         /*
          * Issue Soft Reset to the MAC.  This will reset the chip's
          * transmit, receive, DMA.  It will not effect
          * the current PCI configuration.  The global reset bit is self-
          * clearing, and should clear within a microsecond.
          */
-        AT_WRITE_REGW(hw, REG_MASTER_CTRL, MASTER_CTRL_SOFT_RST);
+        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
+        master_ctrl_data |= MASTER_CTRL_OOB_DIS_OFF;
+        AT_WRITE_REGW(hw, REG_MASTER_CTRL, ((master_ctrl_data | MASTER_CTRL_SOFT_RST)
+                        & 0xFFFF));
+
         AT_WRITE_FLUSH(hw);
         msleep(10);
         /* Wait at least 10ms for All module to be Idle */
@@ -1253,42 +1319,39 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
 {
         u32 pm_ctrl_data;
         u32 link_ctrl_data;
+        u32 link_l1_timer = 0xF;
 
         AT_READ_REG(hw, REG_PM_CTRL, &pm_ctrl_data);
         AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
-        pm_ctrl_data &= ~PM_CTRL_SERDES_PD_EX_L1;
 
+        pm_ctrl_data &= ~PM_CTRL_SERDES_PD_EX_L1;
         pm_ctrl_data &=  ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
                         PM_CTRL_L1_ENTRY_TIMER_SHIFT);
         pm_ctrl_data &= ~(PM_CTRL_LCKDET_TIMER_MASK <<
-                          PM_CTRL_LCKDET_TIMER_SHIFT);
-
-        pm_ctrl_data |= PM_CTRL_MAC_ASPM_CHK;
-        pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
-        pm_ctrl_data |= PM_CTRL_RBER_EN;
-        pm_ctrl_data |= PM_CTRL_SDES_EN;
+                        PM_CTRL_LCKDET_TIMER_SHIFT);
+        pm_ctrl_data |= AT_LCKDET_TIMER << PM_CTRL_LCKDET_TIMER_SHIFT;
 
-        if (hw->nic_type == athr_l2c_b ||
-            hw->nic_type == athr_l1d ||
-            hw->nic_type == athr_l2c_b2) {
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d ||
+                hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
                 link_ctrl_data &= ~LINK_CTRL_EXT_SYNC;
                 if (!(hw->ctrl_flags & ATL1C_APS_MODE_ENABLE)) {
-                        if (hw->nic_type == athr_l2c_b &&
-                            hw->revision_id == L2CB_V10)
+                        if (hw->nic_type == athr_l2c_b && hw->revision_id == L2CB_V10)
                                 link_ctrl_data |= LINK_CTRL_EXT_SYNC;
                 }
 
                 AT_WRITE_REG(hw, REG_LINK_CTRL, link_ctrl_data);
 
-                pm_ctrl_data |= PM_CTRL_PCIE_RECV;
-                pm_ctrl_data |= AT_ASPM_L1_TIMER << PM_CTRL_PM_REQ_TIMER_SHIFT;
-                pm_ctrl_data &= ~PM_CTRL_EN_BUFS_RX_L0S;
+                pm_ctrl_data |= PM_CTRL_RCVR_WT_TIMER;
+                pm_ctrl_data &= ~(PM_CTRL_PM_REQ_TIMER_MASK <<
+                        PM_CTRL_PM_REQ_TIMER_SHIFT);
+                pm_ctrl_data |= AT_ASPM_L1_TIMER <<
+                        PM_CTRL_PM_REQ_TIMER_SHIFT;
                 pm_ctrl_data &= ~PM_CTRL_SA_DLY_EN;
                 pm_ctrl_data &= ~PM_CTRL_HOTRST;
                 pm_ctrl_data |= 1 << PM_CTRL_L1_ENTRY_TIMER_SHIFT;
                 pm_ctrl_data |= PM_CTRL_SERDES_PD_EX_L1;
         }
-
+        pm_ctrl_data |= PM_CTRL_MAC_ASPM_CHK;
         if (linkup) {
                 pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
                 pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
@@ -1297,27 +1360,26 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
                 if (hw->ctrl_flags & ATL1C_ASPM_L0S_SUPPORT)
                         pm_ctrl_data |= PM_CTRL_ASPM_L0S_EN;
 
-                if (hw->nic_type == athr_l2c_b ||
-                    hw->nic_type == athr_l1d ||
-                    hw->nic_type == athr_l2c_b2) {
+                if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d ||
+                        hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
                         if (hw->nic_type == athr_l2c_b)
                                 if (!(hw->ctrl_flags & ATL1C_APS_MODE_ENABLE))
-                                        pm_ctrl_data &= PM_CTRL_ASPM_L0S_EN;
+                                        pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
                         pm_ctrl_data &= ~PM_CTRL_SERDES_L1_EN;
                         pm_ctrl_data &= ~PM_CTRL_SERDES_PLL_L1_EN;
                         pm_ctrl_data &= ~PM_CTRL_SERDES_BUDS_RX_L1_EN;
                         pm_ctrl_data |= PM_CTRL_CLK_SWH_L1;
-                        if (hw->adapter->link_speed == SPEED_100 ||
-                            hw->adapter->link_speed == SPEED_1000) {
-                                pm_ctrl_data &=
-                                        ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
-                                          PM_CTRL_L1_ENTRY_TIMER_SHIFT);
-                                if (hw->nic_type == athr_l1d)
-                                        pm_ctrl_data |= 0xF <<
-                                                PM_CTRL_L1_ENTRY_TIMER_SHIFT;
-                                else
-                                        pm_ctrl_data |= 7 <<
-                                                PM_CTRL_L1_ENTRY_TIMER_SHIFT;
+                if (hw->adapter->link_speed == SPEED_100 ||
+                                hw->adapter->link_speed == SPEED_1000) {
+                                pm_ctrl_data &=  ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
+                                        PM_CTRL_L1_ENTRY_TIMER_SHIFT);
+                                if (hw->nic_type == athr_l2c_b)
+                                        link_l1_timer = 7;
+                                else if (hw->nic_type == athr_l2c_b2 ||
+                                        hw->nic_type == athr_l1d_2)
+                                        link_l1_timer = 4;
+                                pm_ctrl_data |= link_l1_timer <<
+                                        PM_CTRL_L1_ENTRY_TIMER_SHIFT;
                         }
                 } else {
                         pm_ctrl_data |= PM_CTRL_SERDES_L1_EN;
@@ -1326,24 +1388,12 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
                         pm_ctrl_data &= ~PM_CTRL_CLK_SWH_L1;
                         pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
                         pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
-                }
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
-                if (hw->adapter->link_speed == SPEED_10)
-                        if (hw->nic_type == athr_l1d)
-                                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0xB69D);
-                        else
-                                atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
-                else if (hw->adapter->link_speed == SPEED_100)
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB2DD);
-                else
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, 0x96DD);
 
+                }
         } else {
-                pm_ctrl_data &= ~PM_CTRL_SERDES_BUDS_RX_L1_EN;
                 pm_ctrl_data &= ~PM_CTRL_SERDES_L1_EN;
                 pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
                 pm_ctrl_data &= ~PM_CTRL_SERDES_PLL_L1_EN;
-
                 pm_ctrl_data |= PM_CTRL_CLK_SWH_L1;
 
                 if (hw->ctrl_flags & ATL1C_ASPM_L1_SUPPORT)
@@ -1351,8 +1401,9 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
                 else
                         pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
         }
-
         AT_WRITE_REG(hw, REG_PM_CTRL, pm_ctrl_data);
+
+        return;
 }
 
 static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter)
@@ -1391,7 +1442,8 @@ static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter)
                 mac_ctrl_data |= MAC_CTRL_MC_ALL_EN;
 
         mac_ctrl_data |= MAC_CTRL_SINGLE_PAUSE_EN;
-        if (hw->nic_type == athr_l1d || hw->nic_type == athr_l2c_b2) {
+        if (hw->nic_type == athr_l1d || hw->nic_type == athr_l2c_b2 ||
+            hw->nic_type == athr_l1d_2) {
                 mac_ctrl_data |= MAC_CTRL_SPEED_MODE_SW;
                 mac_ctrl_data |= MAC_CTRL_HASH_ALG_CRC32;
         }
@@ -1409,6 +1461,7 @@ static int atl1c_configure(struct atl1c_adapter *adapter)
         struct atl1c_hw *hw = &adapter->hw;
         u32 master_ctrl_data = 0;
         u32 intr_modrt_data;
+        u32 data;
 
         /* clear interrupt status */
         AT_WRITE_REG(hw, REG_ISR, 0xFFFFFFFF);
@@ -1418,6 +1471,15 @@ static int atl1c_configure(struct atl1c_adapter *adapter)
          * HW will enable self to assert interrupt event to system after
          * waiting x-time for software to notify it accept interrupt.
          */
+
+        data = CLK_GATING_EN_ALL;
+        if (hw->ctrl_flags & ATL1C_CLK_GATING_EN) {
+                if (hw->nic_type == athr_l2c_b)
+                        data &= ~CLK_GATING_RXMAC_EN;
+        } else
+                data = 0;
+        AT_WRITE_REG(hw, REG_CLK_GATING_CTRL, data);
+
         AT_WRITE_REG(hw, REG_INT_RETRIG_TIMER,
                 hw->ict & INT_RETRIG_TIMER_MASK);
 
@@ -1436,6 +1498,7 @@ static int atl1c_configure(struct atl1c_adapter *adapter)
         if (hw->ctrl_flags & ATL1C_INTR_CLEAR_ON_READ)
                 master_ctrl_data |= MASTER_CTRL_INT_RDCLR;
 
+        master_ctrl_data |= MASTER_CTRL_SA_TIMER_EN;
         AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
 
         if (hw->ctrl_flags & ATL1C_CMB_ENABLE) {
@@ -1624,11 +1687,9 @@ static irqreturn_t atl1c_intr(int irq, void *data)
                                         "atl1c hardware error (status = 0x%x)\n",
                                         status & ISR_ERROR);
                         /* reset MAC */
-                        hw->intr_mask &= ~ISR_ERROR;
-                        AT_WRITE_REG(hw, REG_IMR, hw->intr_mask);
                         adapter->work_event |= ATL1C_WORK_EVENT_RESET;
                         schedule_work(&adapter->common_task);
-                        break;
+                        return IRQ_HANDLED;
                 }
 
                 if (status & ISR_OVER)
@@ -2303,7 +2364,6 @@ void atl1c_down(struct atl1c_adapter *adapter)
         napi_disable(&adapter->napi);
         atl1c_irq_disable(adapter);
         atl1c_free_irq(adapter);
-        AT_WRITE_REG(&adapter->hw, REG_ISR, ISR_DIS_INT);
         /* reset MAC to disable all RX/TX */
         atl1c_reset_mac(&adapter->hw);
         msleep(1);
@@ -2387,79 +2447,68 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1c_adapter *adapter = netdev_priv(netdev);
         struct atl1c_hw *hw = &adapter->hw;
-        u32 ctrl;
-        u32 mac_ctrl_data;
-        u32 master_ctrl_data;
+        u32 mac_ctrl_data = 0;
+        u32 master_ctrl_data = 0;
         u32 wol_ctrl_data = 0;
-        u16 mii_bmsr_data;
-        u16 save_autoneg_advertised;
-        u16 mii_intr_status_data;
+        u16 mii_intr_status_data = 0;
         u32 wufc = adapter->wol;
-        u32 i;
         int retval = 0;
 
+        atl1c_disable_l0s_l1(hw);
         if (netif_running(netdev)) {
                 WARN_ON(test_bit(__AT_RESETTING, &adapter->flags));
                 atl1c_down(adapter);
         }
         netif_device_detach(netdev);
-        atl1c_disable_l0s_l1(hw);
         retval = pci_save_state(pdev);
         if (retval)
                 return retval;
+
+        if (wufc)
+                if (atl1c_phy_power_saving(hw) != 0)
+                        dev_dbg(&pdev->dev, "phy power saving failed");
+
+        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
+        AT_READ_REG(hw, REG_MAC_CTRL, &mac_ctrl_data);
+
+        master_ctrl_data &= ~MASTER_CTRL_CLK_SEL_DIS;
+        mac_ctrl_data &= ~(MAC_CTRL_PRMLEN_MASK << MAC_CTRL_PRMLEN_SHIFT);
+        mac_ctrl_data |= (((u32)adapter->hw.preamble_len &
+                        MAC_CTRL_PRMLEN_MASK) <<
+                        MAC_CTRL_PRMLEN_SHIFT);
+        mac_ctrl_data &= ~(MAC_CTRL_SPEED_MASK << MAC_CTRL_SPEED_SHIFT);
+        mac_ctrl_data &= ~MAC_CTRL_DUPLX;
+
         if (wufc) {
-                AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
-                master_ctrl_data &= ~MASTER_CTRL_CLK_SEL_DIS;
-
-                /* get link status */
-                atl1c_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
-                atl1c_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
-                save_autoneg_advertised = hw->autoneg_advertised;
-                hw->autoneg_advertised = ADVERTISED_10baseT_Half;
-                if (atl1c_restart_autoneg(hw) != 0)
-                        if (netif_msg_link(adapter))
-                                dev_warn(&pdev->dev, "phy autoneg failed\n");
-                hw->phy_configured = false; /* re-init PHY when resume */
-                hw->autoneg_advertised = save_autoneg_advertised;
+                mac_ctrl_data |= MAC_CTRL_RX_EN;
+                if (adapter->link_speed == SPEED_1000 ||
+                        adapter->link_speed == SPEED_0) {
+                        mac_ctrl_data |= atl1c_mac_speed_1000 <<
+                                        MAC_CTRL_SPEED_SHIFT;
+                        mac_ctrl_data |= MAC_CTRL_DUPLX;
+                } else
+                        mac_ctrl_data |= atl1c_mac_speed_10_100 <<
+                                        MAC_CTRL_SPEED_SHIFT;
+
+                if (adapter->link_duplex == DUPLEX_FULL)
+                        mac_ctrl_data |= MAC_CTRL_DUPLX;
+
                 /* turn on magic packet wol */
                 if (wufc & AT_WUFC_MAG)
-                        wol_ctrl_data = WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
+                        wol_ctrl_data |= WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
 
                 if (wufc & AT_WUFC_LNKC) {
-                        for (i = 0; i < AT_SUSPEND_LINK_TIMEOUT; i++) {
-                                msleep(100);
-                                atl1c_read_phy_reg(hw, MII_BMSR,
-                                        (u16 *)&mii_bmsr_data);
-                                if (mii_bmsr_data & BMSR_LSTATUS)
-                                        break;
-                        }
-                        if ((mii_bmsr_data & BMSR_LSTATUS) == 0)
-                                if (netif_msg_link(adapter))
-                                        dev_warn(&pdev->dev,
-                                                "%s: Link may change"
-                                                "when suspend\n",
-                                                atl1c_driver_name);
                         wol_ctrl_data |=  WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN;
                         /* only link up can wake up */
                         if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) {
-                                if (netif_msg_link(adapter))
-                                        dev_err(&pdev->dev,
-                                                "%s: read write phy "
-                                                "register failed.\n",
-                                                atl1c_driver_name);
-                                goto wol_dis;
+                                dev_dbg(&pdev->dev, "%s: read write phy "
+                                                  "register failed.\n",
+                                                  atl1c_driver_name);
                         }
                 }
                 /* clear phy interrupt */
                 atl1c_read_phy_reg(hw, MII_ISR, &mii_intr_status_data);
                 /* Config MAC Ctrl register */
-                mac_ctrl_data = MAC_CTRL_RX_EN;
-                /* set to 10/100M halt duplex */
-                mac_ctrl_data |= atl1c_mac_speed_10_100 << MAC_CTRL_SPEED_SHIFT;
-                mac_ctrl_data |= (((u32)adapter->hw.preamble_len &
-                                 MAC_CTRL_PRMLEN_MASK) <<
-                                 MAC_CTRL_PRMLEN_SHIFT);
-
                 if (adapter->vlgrp)
                         mac_ctrl_data |= MAC_CTRL_RMV_VLAN;
 
@@ -2467,37 +2516,30 @@ static int atl1c_suspend(struct pci_dev *pdev, pm_message_t state)
                 if (wufc & AT_WUFC_MAG)
                         mac_ctrl_data |= MAC_CTRL_BC_EN;
 
-                if (netif_msg_hw(adapter))
-                        dev_dbg(&pdev->dev,
-                                "%s: suspend MAC=0x%x\n",
-                                atl1c_driver_name, mac_ctrl_data);
+                dev_dbg(&pdev->dev,
+                        "%s: suspend MAC=0x%x\n",
+                        atl1c_driver_name, mac_ctrl_data);
                 AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
                 AT_WRITE_REG(hw, REG_WOL_CTRL, wol_ctrl_data);
                 AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
 
                 /* pcie patch */
-                AT_READ_REG(hw, REG_PCIE_PHYMISC, &ctrl);
-                ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
-                AT_WRITE_REG(hw, REG_PCIE_PHYMISC, ctrl);
+                device_set_wakeup_enable(&pdev->dev, 1);
 
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto suspend_exit;
+                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;
+                mac_ctrl_data |= atl1c_mac_speed_10_100 << MAC_CTRL_SPEED_SHIFT;
+                mac_ctrl_data |= MAC_CTRL_DUPLX;
+                AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
+                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);
         }
-wol_dis:
-
-        /* WOL disabled */
-        AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
-
-        /* pcie patch */
-        AT_READ_REG(hw, REG_PCIE_PHYMISC, &ctrl);
-        ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
-        AT_WRITE_REG(hw, REG_PCIE_PHYMISC, ctrl);
-
-        atl1c_phy_disable(hw);
-        hw->phy_configured = false; /* re-init PHY when resume */
-
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
-suspend_exit:
 
         pci_disable_device(pdev);
         pci_set_power_state(pdev, pci_choose_state(pdev, state));
@@ -2516,9 +2558,19 @@ static int atl1c_resume(struct pci_dev *pdev)
         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);
 
         atl1c_phy_reset(&adapter->hw);
         atl1c_reset_mac(&adapter->hw);
+        atl1c_phy_init(&adapter->hw);
+
+#if 0
+        AT_READ_REG(&adapter->hw, REG_PM_CTRLSTAT, &pm_data);
+        pm_data &= ~PM_CTRLSTAT_PME_EN;
+        AT_WRITE_REG(&adapter->hw, REG_PM_CTRLSTAT, pm_data);
+#endif
+
         netif_device_attach(netdev);
         if (netif_running(netdev))
                 atl1c_up(adapter);
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index 146372fd668..9c0ddb273ac 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -436,8 +436,8 @@ struct rx_free_desc {
         __le16 buf_len;         /* Size of the receive buffer in host memory */
         u16 coalese;            /* Update consumer index to host after the
                                  * reception of this frame */
-        /* __attribute__ ((packed)) is required */
-} __attribute__ ((packed));
+        /* __packed is required */
+} __packed;
 
 /*
  * The L1 transmit packet descriptor is comprised of four 32-bit words.
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 373c1a56347..b46be490cd2 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -283,6 +283,8 @@ struct be_adapter {
         u8 port_type;
         u8 transceiver;
         u8 generation;          /* BladeEngine ASIC generation */
+        u32 flash_status;
+        struct completion flash_compl;
 
         bool sriov_enabled;
         u32 vf_if_handle[BE_MAX_VF];
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index e79bf8b9af3..ee1ad9693c8 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -59,6 +59,13 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
 
         compl_status = (compl->status >> CQE_STATUS_COMPL_SHIFT) &
                                 CQE_STATUS_COMPL_MASK;
+
+        if ((compl->tag0 == OPCODE_COMMON_WRITE_FLASHROM) &&
+                (compl->tag1 == CMD_SUBSYSTEM_COMMON)) {
+                adapter->flash_status = compl_status;
+                complete(&adapter->flash_compl);
+        }
+
         if (compl_status == MCC_STATUS_SUCCESS) {
                 if (compl->tag0 == OPCODE_ETH_GET_STATISTICS) {
                         struct be_cmd_resp_get_stats *resp =
@@ -179,7 +186,7 @@ static int be_mcc_notify_wait(struct be_adapter *adapter)
 
 static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
 {
-        int cnt = 0, wait = 5;
+        int msecs = 0;
         u32 ready;
 
         do {
@@ -194,15 +201,14 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
                 if (ready)
                         break;
 
-                if (cnt > 4000000) {
+                if (msecs > 4000) {
                         dev_err(&adapter->pdev->dev, "mbox poll timed out\n");
                         return -1;
                 }
 
-                if (cnt > 50)
-                        wait = 200;
-                cnt += wait;
-                udelay(wait);
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(msecs_to_jiffies(1));
+                msecs++;
         } while (true);
 
         return 0;
@@ -287,7 +293,7 @@ int be_cmd_POST(struct be_adapter *adapter)
                 } else {
                         return 0;
                 }
-        } while (timeout < 20);
+        } while (timeout < 40);
 
         dev_err(&adapter->pdev->dev, "POST timeout; stage=0x%x\n", stage);
         return -1;
@@ -1417,17 +1423,19 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd,
         int status;
 
         spin_lock_bh(&adapter->mcc_lock);
+        adapter->flash_status = 0;
 
         wrb = wrb_from_mccq(adapter);
         if (!wrb) {
                 status = -EBUSY;
-                goto err;
+                goto err_unlock;
         }
         req = cmd->va;
         sge = nonembedded_sgl(wrb);
 
         be_wrb_hdr_prepare(wrb, cmd->size, false, 1,
                         OPCODE_COMMON_WRITE_FLASHROM);
+        wrb->tag1 = CMD_SUBSYSTEM_COMMON;
 
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_WRITE_FLASHROM, cmd->size);
@@ -1439,9 +1447,18 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd,
         req->params.op_code = cpu_to_le32(flash_opcode);
         req->params.data_buf_size = cpu_to_le32(buf_size);
 
-        status = be_mcc_notify_wait(adapter);
+        be_mcc_notify(adapter);
+        spin_unlock_bh(&adapter->mcc_lock);
 
-err:
+        if (!wait_for_completion_timeout(&adapter->flash_compl,
+                        msecs_to_jiffies(12000)))
+                status = -1;
+        else
+                status = adapter->flash_status;
+
+        return status;
+
+err_unlock:
         spin_unlock_bh(&adapter->mcc_lock);
         return status;
 }
@@ -1482,7 +1499,7 @@ err:
         return status;
 }
 
-extern int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,
+int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,
                                 struct be_dma_mem *nonemb_cmd)
 {
         struct be_mcc_wrb *wrb;
@@ -1575,7 +1592,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,
 
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
                         OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));
-        req->hdr.timeout = 4;
+        req->hdr.timeout = cpu_to_le32(4);
 
         req->pattern = cpu_to_le64(pattern);
         req->src_port = cpu_to_le32(port_num);
@@ -1647,7 +1664,7 @@ err:
         return status;
 }
 
-extern int be_cmd_get_seeprom_data(struct be_adapter *adapter,
+int be_cmd_get_seeprom_data(struct be_adapter *adapter,
                                 struct be_dma_mem *nonemb_cmd)
 {
         struct be_mcc_wrb *wrb;
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h
index 063026de495..06839676e3c 100644
--- a/drivers/net/benet/be_hw.h
+++ b/drivers/net/benet/be_hw.h
@@ -192,7 +192,7 @@ struct amap_eth_hdr_wrb {
         u8 event;
         u8 crc;
         u8 forward;
-        u8 ipsec;
+        u8 lso6;
         u8 mgmt;
         u8 ipcs;
         u8 udpcs;
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 058d7f95f5a..01eb447f98b 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -373,10 +373,12 @@ static void wrb_fill_hdr(struct be_eth_hdr_wrb *hdr, struct sk_buff *skb,
 
         AMAP_SET_BITS(struct amap_eth_hdr_wrb, crc, hdr, 1);
 
-        if (skb_shinfo(skb)->gso_segs > 1 && skb_shinfo(skb)->gso_size) {
+        if (skb_is_gso(skb)) {
                 AMAP_SET_BITS(struct amap_eth_hdr_wrb, lso, hdr, 1);
                 AMAP_SET_BITS(struct amap_eth_hdr_wrb, lso_mss,
                         hdr, skb_shinfo(skb)->gso_size);
+                if (skb_is_gso_v6(skb))
+                        AMAP_SET_BITS(struct amap_eth_hdr_wrb, lso6, hdr, 1);
         } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 if (is_tcp_pkt(skb))
                         AMAP_SET_BITS(struct amap_eth_hdr_wrb, tcpcs, hdr, 1);
@@ -1735,6 +1737,44 @@ done:
         adapter->isr_registered = false;
 }
 
+static int be_close(struct net_device *netdev)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+        struct be_eq_obj *rx_eq = &adapter->rx_eq;
+        struct be_eq_obj *tx_eq = &adapter->tx_eq;
+        int vec;
+
+        cancel_delayed_work_sync(&adapter->work);
+
+        be_async_mcc_disable(adapter);
+
+        netif_stop_queue(netdev);
+        netif_carrier_off(netdev);
+        adapter->link_up = false;
+
+        be_intr_set(adapter, false);
+
+        if (adapter->msix_enabled) {
+                vec = be_msix_vec_get(adapter, tx_eq->q.id);
+                synchronize_irq(vec);
+                vec = be_msix_vec_get(adapter, rx_eq->q.id);
+                synchronize_irq(vec);
+        } else {
+                synchronize_irq(netdev->irq);
+        }
+        be_irq_unregister(adapter);
+
+        napi_disable(&rx_eq->napi);
+        napi_disable(&tx_eq->napi);
+
+        /* Wait for all pending tx completions to arrive so that
+         * all tx skbs are freed.
+         */
+        be_tx_compl_clean(adapter);
+
+        return 0;
+}
+
 static int be_open(struct net_device *netdev)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
@@ -1765,27 +1805,29 @@ static int be_open(struct net_device *netdev)
         /* Now that interrupts are on we can process async mcc */
         be_async_mcc_enable(adapter);
 
+        schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
+
         status = be_cmd_link_status_query(adapter, &link_up, &mac_speed,
                         &link_speed);
         if (status)
-                goto ret_sts;
+                goto err;
         be_link_status_update(adapter, link_up);
 
-        if (be_physfn(adapter))
+        if (be_physfn(adapter)) {
                 status = be_vid_config(adapter);
-        if (status)
-                goto ret_sts;
+                if (status)
+                        goto err;
 
-        if (be_physfn(adapter)) {
                 status = be_cmd_set_flow_control(adapter,
                                 adapter->tx_fc, adapter->rx_fc);
                 if (status)
-                        goto ret_sts;
+                        goto err;
         }
 
-        schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
-ret_sts:
-        return status;
+        return 0;
+err:
+        be_close(adapter->netdev);
+        return -EIO;
 }
 
 static int be_setup_wol(struct be_adapter *adapter, bool enable)
@@ -1861,7 +1903,7 @@ static int be_setup(struct be_adapter *adapter)
                                 goto if_destroy;
                         }
                         vf++;
-                } while (vf < num_vfs);
+                }
         } else if (!be_physfn(adapter)) {
                 status = be_cmd_mac_addr_query(adapter, mac,
                         MAC_ADDRESS_TYPE_NETWORK, false, adapter->if_handle);
@@ -1913,43 +1955,6 @@ static int be_clear(struct be_adapter *adapter)
         return 0;
 }
 
-static int be_close(struct net_device *netdev)
-{
-        struct be_adapter *adapter = netdev_priv(netdev);
-        struct be_eq_obj *rx_eq = &adapter->rx_eq;
-        struct be_eq_obj *tx_eq = &adapter->tx_eq;
-        int vec;
-
-        cancel_delayed_work_sync(&adapter->work);
-
-        be_async_mcc_disable(adapter);
-
-        netif_stop_queue(netdev);
-        netif_carrier_off(netdev);
-        adapter->link_up = false;
-
-        be_intr_set(adapter, false);
-
-        if (adapter->msix_enabled) {
-                vec = be_msix_vec_get(adapter, tx_eq->q.id);
-                synchronize_irq(vec);
-                vec = be_msix_vec_get(adapter, rx_eq->q.id);
-                synchronize_irq(vec);
-        } else {
-                synchronize_irq(netdev->irq);
-        }
-        be_irq_unregister(adapter);
-
-        napi_disable(&rx_eq->napi);
-        napi_disable(&tx_eq->napi);
-
-        /* Wait for all pending tx completions to arrive so that
-         * all tx skbs are freed.
-         */
-        be_tx_compl_clean(adapter);
-
-        return 0;
-}
 
 #define FW_FILE_HDR_SIGN        "ServerEngines Corp. "
 char flash_cookie[2][16] =      {"*** SE FLAS",
@@ -2183,7 +2188,7 @@ static void be_netdev_init(struct net_device *netdev)
 
         netdev->features |= NETIF_F_SG | NETIF_F_HW_VLAN_RX | NETIF_F_TSO |
                 NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER | NETIF_F_HW_CSUM |
-                NETIF_F_GRO;
+                NETIF_F_GRO | NETIF_F_TSO6;
 
         netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_HW_CSUM;
 
@@ -2319,6 +2324,7 @@ static int be_ctrl_init(struct be_adapter *adapter)
         spin_lock_init(&adapter->mcc_lock);
         spin_lock_init(&adapter->mcc_cq_lock);
 
+        init_completion(&adapter->flash_compl);
         pci_save_state(adapter->pdev);
         return 0;
 
@@ -2487,10 +2493,6 @@ static int __devinit be_probe(struct pci_dev *pdev,
                 status = be_cmd_POST(adapter);
                 if (status)
                         goto ctrl_clean;
-
-                status = be_cmd_reset_function(adapter);
-                if (status)
-                        goto ctrl_clean;
         }
 
         /* tell fw we're ready to fire cmds */
@@ -2498,6 +2500,12 @@ static int __devinit be_probe(struct pci_dev *pdev,
         if (status)
                 goto ctrl_clean;
 
+        if (be_physfn(adapter)) {
+                status = be_cmd_reset_function(adapter);
+                if (status)
+                        goto ctrl_clean;
+        }
+
         status = be_stats_init(adapter);
         if (status)
                 goto ctrl_clean;
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 39a54bad397..012613fde3f 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -922,61 +922,73 @@ static void bfin_mac_hwtstamp_init(struct net_device *netdev)
 # define bfin_tx_hwtstamp(dev, skb)
 #endif
 
-static void adjust_tx_list(void)
+static inline void _tx_reclaim_skb(void)
+{
+        do {
+                tx_list_head->desc_a.config &= ~DMAEN;
+                tx_list_head->status.status_word = 0;
+                if (tx_list_head->skb) {
+                        dev_kfree_skb(tx_list_head->skb);
+                        tx_list_head->skb = NULL;
+                }
+                tx_list_head = tx_list_head->next;
+
+        } while (tx_list_head->status.status_word != 0);
+}
+
+static void tx_reclaim_skb(struct bfin_mac_local *lp)
 {
         int timeout_cnt = MAX_TIMEOUT_CNT;
 
-        if (tx_list_head->status.status_word != 0 &&
-            current_tx_ptr != tx_list_head) {
-                goto adjust_head;       /* released something, just return; */
-        }
+        if (tx_list_head->status.status_word != 0)
+                _tx_reclaim_skb();
 
-        /*
-         * if nothing released, check wait condition
-         * current's next can not be the head,
-         * otherwise the dma will not stop as we want
-         */
-        if (current_tx_ptr->next->next == tx_list_head) {
+        if (current_tx_ptr->next == tx_list_head) {
                 while (tx_list_head->status.status_word == 0) {
+                        /* slow down polling to avoid too many queue stop. */
                         udelay(10);
-                        if (tx_list_head->status.status_word != 0 ||
-                            !(bfin_read_DMA2_IRQ_STATUS() & DMA_RUN)) {
-                                goto adjust_head;
-                        }
-                        if (timeout_cnt-- < 0) {
-                                printk(KERN_ERR DRV_NAME
-                                ": wait for adjust tx list head timeout\n");
+                        /* reclaim skb if DMA is not running. */
+                        if (!(bfin_read_DMA2_IRQ_STATUS() & DMA_RUN))
+                                break;
+                        if (timeout_cnt-- < 0)
                                 break;
-                        }
-                }
-                if (tx_list_head->status.status_word != 0) {
-                        goto adjust_head;
                 }
+
+                if (timeout_cnt >= 0)
+                        _tx_reclaim_skb();
+                else
+                        netif_stop_queue(lp->ndev);
         }
 
-        return;
+        if (current_tx_ptr->next != tx_list_head &&
+                netif_queue_stopped(lp->ndev))
+                netif_wake_queue(lp->ndev);
+
+        if (tx_list_head != current_tx_ptr) {
+                /* shorten the timer interval if tx queue is stopped */
+                if (netif_queue_stopped(lp->ndev))
+                        lp->tx_reclaim_timer.expires =
+                                jiffies + (TX_RECLAIM_JIFFIES >> 4);
+                else
+                        lp->tx_reclaim_timer.expires =
+                                jiffies + TX_RECLAIM_JIFFIES;
+
+                mod_timer(&lp->tx_reclaim_timer,
+                        lp->tx_reclaim_timer.expires);
+        }
 
-adjust_head:
-        do {
-                tx_list_head->desc_a.config &= ~DMAEN;
-                tx_list_head->status.status_word = 0;
-                if (tx_list_head->skb) {
-                        dev_kfree_skb(tx_list_head->skb);
-                        tx_list_head->skb = NULL;
-                } else {
-                        printk(KERN_ERR DRV_NAME
-                               ": no sk_buff in a transmitted frame!\n");
-                }
-                tx_list_head = tx_list_head->next;
-        } while (tx_list_head->status.status_word != 0 &&
-                 current_tx_ptr != tx_list_head);
         return;
+}
 
+static void tx_reclaim_skb_timeout(unsigned long lp)
+{
+        tx_reclaim_skb((struct bfin_mac_local *)lp);
 }
 
 static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
                                 struct net_device *dev)
 {
+        struct bfin_mac_local *lp = netdev_priv(dev);
         u16 *data;
         u32 data_align = (unsigned long)(skb->data) & 0x3;
         union skb_shared_tx *shtx = skb_tx(skb);
@@ -1009,8 +1021,6 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
                         skb->len);
                 current_tx_ptr->desc_a.start_addr =
                         (u32)current_tx_ptr->packet;
-                if (current_tx_ptr->status.status_word != 0)
-                        current_tx_ptr->status.status_word = 0;
                 blackfin_dcache_flush_range(
                         (u32)current_tx_ptr->packet,
                         (u32)(current_tx_ptr->packet + skb->len + 2));
@@ -1022,6 +1032,9 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
          */
         SSYNC();
 
+        /* always clear status buffer before start tx dma */
+        current_tx_ptr->status.status_word = 0;
+
         /* enable this packet's dma */
         current_tx_ptr->desc_a.config |= DMAEN;
 
@@ -1037,13 +1050,14 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
         bfin_write_EMAC_OPMODE(bfin_read_EMAC_OPMODE() | TE);
 
 out:
-        adjust_tx_list();
-
         bfin_tx_hwtstamp(dev, skb);
 
         current_tx_ptr = current_tx_ptr->next;
         dev->stats.tx_packets++;
         dev->stats.tx_bytes += (skb->len);
+
+        tx_reclaim_skb(lp);
+
         return NETDEV_TX_OK;
 }
 
@@ -1167,8 +1181,11 @@ real_rx:
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void bfin_mac_poll(struct net_device *dev)
 {
+        struct bfin_mac_local *lp = netdev_priv(dev);
+
         disable_irq(IRQ_MAC_RX);
         bfin_mac_interrupt(IRQ_MAC_RX, dev);
+        tx_reclaim_skb(lp);
         enable_irq(IRQ_MAC_RX);
 }
 #endif                          /* CONFIG_NET_POLL_CONTROLLER */
@@ -1232,12 +1249,27 @@ static int bfin_mac_enable(void)
 /* Our watchdog timed out. Called by the networking layer */
 static void bfin_mac_timeout(struct net_device *dev)
 {
+        struct bfin_mac_local *lp = netdev_priv(dev);
+
         pr_debug("%s: %s\n", dev->name, __func__);
 
         bfin_mac_disable();
 
-        /* reset tx queue */
-        tx_list_tail = tx_list_head->next;
+        del_timer(&lp->tx_reclaim_timer);
+
+        /* reset tx queue and free skb */
+        while (tx_list_head != current_tx_ptr) {
+                tx_list_head->desc_a.config &= ~DMAEN;
+                tx_list_head->status.status_word = 0;
+                if (tx_list_head->skb) {
+                        dev_kfree_skb(tx_list_head->skb);
+                        tx_list_head->skb = NULL;
+                }
+                tx_list_head = tx_list_head->next;
+        }
+
+        if (netif_queue_stopped(lp->ndev))
+                netif_wake_queue(lp->ndev);
 
         bfin_mac_enable();
 
@@ -1430,6 +1462,7 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         SET_NETDEV_DEV(ndev, &pdev->dev);
         platform_set_drvdata(pdev, ndev);
         lp = netdev_priv(ndev);
+        lp->ndev = ndev;
 
         /* Grab the MAC address in the MAC */
         *(__le32 *) (&(ndev->dev_addr[0])) = cpu_to_le32(bfin_read_EMAC_ADDRLO());
@@ -1485,6 +1518,10 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         ndev->netdev_ops = &bfin_mac_netdev_ops;
         ndev->ethtool_ops = &bfin_mac_ethtool_ops;
 
+        init_timer(&lp->tx_reclaim_timer);
+        lp->tx_reclaim_timer.data = (unsigned long)lp;
+        lp->tx_reclaim_timer.function = tx_reclaim_skb_timeout;
+
         spin_lock_init(&lp->lock);
 
         /* now, enable interrupts */
@@ -1626,6 +1663,7 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
         return 0;
 
 out_err_mdiobus_register:
+        kfree(miibus->irq);
         mdiobus_free(miibus);
 out_err_alloc:
         peripheral_free_list(pin_req);
@@ -1638,6 +1676,7 @@ static int __devexit bfin_mii_bus_remove(struct platform_device *pdev)
         struct mii_bus *miibus = platform_get_drvdata(pdev);
         platform_set_drvdata(pdev, NULL);
         mdiobus_unregister(miibus);
+        kfree(miibus->irq);
         mdiobus_free(miibus);
         peripheral_free_list(pin_req);
         return 0;
diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index 1ae7b82ceee..04e4050df18 100644
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -13,9 +13,12 @@
 #include <linux/net_tstamp.h>
 #include <linux/clocksource.h>
 #include <linux/timecompare.h>
+#include <linux/timer.h>
 
 #define BFIN_MAC_CSUM_OFFLOAD
 
+#define TX_RECLAIM_JIFFIES (HZ / 5)
+
 struct dma_descriptor {
         struct dma_descriptor *next_dma_desc;
         unsigned long start_addr;
@@ -68,6 +71,8 @@ struct bfin_mac_local {
 
         int wol;                /* Wake On Lan */
         int irq_wake_requested;
+        struct timer_list tx_reclaim_timer;
+        struct net_device *ndev;
 
         /* MII and PHY stuffs */
         int old_link;          /* used by bf537_adjust_link */
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 188e356c30a..522de9f818b 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -247,6 +247,7 @@ static const struct flash_spec flash_5709 = {
 MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);
 
 static void bnx2_init_napi(struct bnx2 *bp);
+static void bnx2_del_napi(struct bnx2 *bp);
 
 static inline u32 bnx2_tx_avail(struct bnx2 *bp, struct bnx2_tx_ring_info *txr)
 {
@@ -1445,7 +1446,8 @@ bnx2_test_and_disable_2g5(struct bnx2 *bp)
 static void
 bnx2_enable_forced_2g5(struct bnx2 *bp)
 {
-        u32 bmcr;
+        u32 uninitialized_var(bmcr);
+        int err;
 
         if (!(bp->phy_flags & BNX2_PHY_FLAG_2_5G_CAPABLE))
                 return;
@@ -1455,22 +1457,28 @@ bnx2_enable_forced_2g5(struct bnx2 *bp)
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_SERDES_DIG);
-                bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val);
-                val &= ~MII_BNX2_SD_MISC1_FORCE_MSK;
-                val |= MII_BNX2_SD_MISC1_FORCE | MII_BNX2_SD_MISC1_FORCE_2_5G;
-                bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                if (!bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val)) {
+                        val &= ~MII_BNX2_SD_MISC1_FORCE_MSK;
+                        val |= MII_BNX2_SD_MISC1_FORCE |
+                                MII_BNX2_SD_MISC1_FORCE_2_5G;
+                        bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                }
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
 
         } else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
-                bmcr |= BCM5708S_BMCR_FORCE_2500;
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                if (!err)
+                        bmcr |= BCM5708S_BMCR_FORCE_2500;
         } else {
                 return;
         }
 
+        if (err)
+                return;
+
         if (bp->autoneg & AUTONEG_SPEED) {
                 bmcr &= ~BMCR_ANENABLE;
                 if (bp->req_duplex == DUPLEX_FULL)
@@ -1482,7 +1490,8 @@ bnx2_enable_forced_2g5(struct bnx2 *bp)
 static void
 bnx2_disable_forced_2g5(struct bnx2 *bp)
 {
-        u32 bmcr;
+        u32 uninitialized_var(bmcr);
+        int err;
 
         if (!(bp->phy_flags & BNX2_PHY_FLAG_2_5G_CAPABLE))
                 return;
@@ -1492,21 +1501,26 @@ bnx2_disable_forced_2g5(struct bnx2 *bp)
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_SERDES_DIG);
-                bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val);
-                val &= ~MII_BNX2_SD_MISC1_FORCE;
-                bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                if (!bnx2_read_phy(bp, MII_BNX2_SERDES_DIG_MISC1, &val)) {
+                        val &= ~MII_BNX2_SD_MISC1_FORCE;
+                        bnx2_write_phy(bp, MII_BNX2_SERDES_DIG_MISC1, val);
+                }
 
                 bnx2_write_phy(bp, MII_BNX2_BLK_ADDR,
                                MII_BNX2_BLK_ADDR_COMBO_IEEEB0);
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
 
         } else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
-                bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
-                bmcr &= ~BCM5708S_BMCR_FORCE_2500;
+                err = bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
+                if (!err)
+                        bmcr &= ~BCM5708S_BMCR_FORCE_2500;
         } else {
                 return;
         }
 
+        if (err)
+                return;
+
         if (bp->autoneg & AUTONEG_SPEED)
                 bmcr |= BMCR_SPEED1000 | BMCR_ANENABLE | BMCR_ANRESTART;
         bnx2_write_phy(bp, bp->mii_bmcr, bmcr);
@@ -6270,6 +6284,7 @@ open_err:
         bnx2_free_skbs(bp);
         bnx2_free_irq(bp);
         bnx2_free_mem(bp);
+        bnx2_del_napi(bp);
         return rc;
 }
 
@@ -6537,6 +6552,7 @@ bnx2_close(struct net_device *dev)
         bnx2_free_irq(bp);
         bnx2_free_skbs(bp);
         bnx2_free_mem(bp);
+        bnx2_del_napi(bp);
         bp->link_up = 0;
         netif_carrier_off(bp->dev);
         bnx2_set_power_state(bp, PCI_D3hot);
@@ -8227,7 +8243,16 @@ bnx2_bus_string(struct bnx2 *bp, char *str)
         return str;
 }
 
-static void __devinit
+static void
+bnx2_del_napi(struct bnx2 *bp)
+{
+        int i;
+
+        for (i = 0; i < bp->irq_nvecs; i++)
+                netif_napi_del(&bp->bnx2_napi[i].napi);
+}
+
+static void
 bnx2_init_napi(struct bnx2 *bp)
 {
         int i;
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c
index ff70be89876..0383e306631 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x_link.c
@@ -4266,14 +4266,16 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                                MDIO_PMA_REG_10G_CTRL2, 0x0008);
                         }
 
-                        /* Set 2-wire transfer rate to 400Khz since 100Khz
-                        is not operational */
+                        /* Set 2-wire transfer rate of SFP+ module EEPROM
+                         * to 100Khz since some DACs(direct attached cables) do
+                         * not work at 400Khz.
+                         */
                         bnx2x_cl45_write(bp, params->port,
                                        ext_phy_type,
                                        ext_phy_addr,
                                        MDIO_PMA_DEVAD,
                                        MDIO_PMA_REG_8727_TWO_WIRE_SLAVE_ADDR,
-                                       0xa101);
+                                       0xa001);
 
                         /* Set TX PreEmphasis if needed */
                         if ((params->feature_config_flags &
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 40fdc41446c..25c14c6236f 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -233,34 +233,27 @@ static void tlb_deinitialize(struct bonding *bond)
         _unlock_tx_hashtbl(bond);
 }
 
+static long long compute_gap(struct slave *slave)
+{
+        return (s64) (slave->speed << 20) - /* Convert to Megabit per sec */
+               (s64) (SLAVE_TLB_INFO(slave).load << 3); /* Bytes to bits */
+}
+
 /* Caller must hold bond lock for read */
 static struct slave *tlb_get_least_loaded_slave(struct bonding *bond)
 {
         struct slave *slave, *least_loaded;
-        s64 max_gap;
-        int i, found = 0;
-
-        /* Find the first enabled slave */
-        bond_for_each_slave(bond, slave, i) {
-                if (SLAVE_IS_OK(slave)) {
-                        found = 1;
-                        break;
-                }
-        }
-
-        if (!found) {
-                return NULL;
-        }
+        long long max_gap;
+        int i;
 
-        least_loaded = slave;
-        max_gap = (s64)(slave->speed << 20) - /* Convert to Megabit per sec */
-                        (s64)(SLAVE_TLB_INFO(slave).load << 3); /* Bytes to bits */
+        least_loaded = NULL;
+        max_gap = LLONG_MIN;
 
         /* Find the slave with the largest gap */
-        bond_for_each_slave_from(bond, slave, i, least_loaded) {
+        bond_for_each_slave(bond, slave, i) {
                 if (SLAVE_IS_OK(slave)) {
-                        s64 gap = (s64)(slave->speed << 20) -
-                                        (s64)(SLAVE_TLB_INFO(slave).load << 3);
+                        long long gap = compute_gap(slave);
+
                         if (max_gap < gap) {
                                 least_loaded = slave;
                                 max_gap = gap;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5e12462a9d5..a95a41b74b4 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -90,6 +90,7 @@
 #define BOND_LINK_ARP_INTERV    0
 
 static int max_bonds    = BOND_DEFAULT_MAX_BONDS;
+static int tx_queues    = BOND_DEFAULT_TX_QUEUES;
 static int num_grat_arp = 1;
 static int num_unsol_na = 1;
 static int miimon       = BOND_LINK_MON_INTERV;
@@ -106,10 +107,13 @@ static int arp_interval = BOND_LINK_ARP_INTERV;
 static char *arp_ip_target[BOND_MAX_ARP_TARGETS];
 static char *arp_validate;
 static char *fail_over_mac;
+static int all_slaves_active = 0;
 static struct bond_params bonding_defaults;
 
 module_param(max_bonds, int, 0);
 MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
+module_param(tx_queues, int, 0);
+MODULE_PARM_DESC(tx_queues, "Max number of transmit queues (default = 16)");
 module_param(num_grat_arp, int, 0644);
 MODULE_PARM_DESC(num_grat_arp, "Number of gratuitous ARP packets to send on failover event");
 module_param(num_unsol_na, int, 0644);
@@ -155,6 +159,10 @@ module_param(arp_validate, charp, 0);
 MODULE_PARM_DESC(arp_validate, "validate src/dst of ARP probes: none (default), active, backup or all");
 module_param(fail_over_mac, charp, 0);
 MODULE_PARM_DESC(fail_over_mac, "For active-backup, do not set all slaves to the same MAC.  none (default), active or follow");
+module_param(all_slaves_active, int, 0);
+MODULE_PARM_DESC(all_slaves_active, "Keep all frames received on an interface"
+                                     "by setting active flag for all slaves.  "
+                                     "0 for never (default), 1 for always.");
 
 /*----------------------------- Global variables ----------------------------*/
 
@@ -1522,16 +1530,32 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 }
         }
 
+        /* If this is the first slave, then we need to set the master's hardware
+         * address to be the same as the slave's. */
+        if (bond->slave_cnt == 0)
+                memcpy(bond->dev->dev_addr, slave_dev->dev_addr,
+                       slave_dev->addr_len);
+
+
         new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
         if (!new_slave) {
                 res = -ENOMEM;
                 goto err_undo_flags;
         }
 
-        /* save slave's original flags before calling
-         * netdev_set_master and dev_open
+        /*
+         * Set the new_slave's queue_id to be zero.  Queue ID mapping
+         * is set via sysfs or module option if desired.
          */
-        new_slave->original_flags = slave_dev->flags;
+        new_slave->queue_id = 0;
+
+        /* Save slave's original mtu and then set it to match the bond */
+        new_slave->original_mtu = slave_dev->mtu;
+        res = dev_set_mtu(slave_dev, bond->dev->mtu);
+        if (res) {
+                pr_debug("Error %d calling dev_set_mtu\n", res);
+                goto err_free;
+        }
 
         /*
          * Save slave's original ("permanent") mac address for modes
@@ -1550,7 +1574,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 res = dev_set_mac_address(slave_dev, &addr);
                 if (res) {
                         pr_debug("Error %d calling set_mac_address\n", res);
-                        goto err_free;
+                        goto err_restore_mtu;
                 }
         }
 
@@ -1785,6 +1809,9 @@ err_restore_mac:
                 dev_set_mac_address(slave_dev, &addr);
         }
 
+err_restore_mtu:
+        dev_set_mtu(slave_dev, new_slave->original_mtu);
+
 err_free:
         kfree(new_slave);
 
@@ -1969,6 +1996,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 dev_set_mac_address(slave_dev, &addr);
         }
 
+        dev_set_mtu(slave_dev, slave->original_mtu);
+
         slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB |
                                    IFF_SLAVE_INACTIVE | IFF_BONDING |
                                    IFF_SLAVE_NEEDARP);
@@ -2555,7 +2584,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 /*
                  * This target is not on a VLAN
                  */
-                if (rt->u.dst.dev == bond->dev) {
+                if (rt->dst.dev == bond->dev) {
                         ip_rt_put(rt);
                         pr_debug("basa: rtdev == bond->dev: arp_send\n");
                         bond_arp_send(slave->dev, ARPOP_REQUEST, targets[i],
@@ -2566,7 +2595,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 vlan_id = 0;
                 list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                         vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
-                        if (vlan_dev == rt->u.dst.dev) {
+                        if (vlan_dev == rt->dst.dev) {
                                 vlan_id = vlan->vlan_id;
                                 pr_debug("basa: vlan match on %s %d\n",
                                        vlan_dev->name, vlan_id);
@@ -2584,7 +2613,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 if (net_ratelimit()) {
                         pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
                                    bond->dev->name, &fl.fl4_dst,
-                                   rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
+                                   rt->dst.dev ? rt->dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
         }
@@ -3265,6 +3294,7 @@ static void bond_info_show_slave(struct seq_file *seq,
                 else
                         seq_puts(seq, "Aggregator ID: N/A\n");
         }
+        seq_printf(seq, "Slave queue ID: %d\n", slave->queue_id);
 }
 
 static int bond_info_seq_show(struct seq_file *seq, void *v)
@@ -3774,20 +3804,21 @@ static int bond_close(struct net_device *bond_dev)
         return 0;
 }
 
-static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
+static struct rtnl_link_stats64 *bond_get_stats(struct net_device *bond_dev)
 {
         struct bonding *bond = netdev_priv(bond_dev);
-        struct net_device_stats *stats = &bond_dev->stats;
-        struct net_device_stats local_stats;
+        struct rtnl_link_stats64 *stats = &bond_dev->stats64;
+        struct rtnl_link_stats64 local_stats;
         struct slave *slave;
         int i;
 
-        memset(&local_stats, 0, sizeof(struct net_device_stats));
+        memset(&local_stats, 0, sizeof(local_stats));
 
         read_lock_bh(&bond->lock);
 
         bond_for_each_slave(bond, slave, i) {
-                const struct net_device_stats *sstats = dev_get_stats(slave->dev);
+                const struct rtnl_link_stats64 *sstats =
+                        dev_get_stats(slave->dev);
 
                 local_stats.rx_packets += sstats->rx_packets;
                 local_stats.rx_bytes += sstats->rx_bytes;
@@ -4401,9 +4432,59 @@ static void bond_set_xmit_hash_policy(struct bonding *bond)
         }
 }
 
+/*
+ * Lookup the slave that corresponds to a qid
+ */
+static inline int bond_slave_override(struct bonding *bond,
+                                      struct sk_buff *skb)
+{
+        int i, res = 1;
+        struct slave *slave = NULL;
+        struct slave *check_slave;
+
+        read_lock(&bond->lock);
+
+        if (!BOND_IS_OK(bond) || !skb->queue_mapping)
+                goto out;
+
+        /* Find out if any slaves have the same mapping as this skb. */
+        bond_for_each_slave(bond, check_slave, i) {
+                if (check_slave->queue_id == skb->queue_mapping) {
+                        slave = check_slave;
+                        break;
+                }
+        }
+
+        /* If the slave isn't UP, use default transmit policy. */
+        if (slave && slave->queue_id && IS_UP(slave->dev) &&
+            (slave->link == BOND_LINK_UP)) {
+                res = bond_dev_queue_xmit(bond, skb, slave->dev);
+        }
+
+out:
+        read_unlock(&bond->lock);
+        return res;
+}
+
+static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+        /*
+         * This helper function exists to help dev_pick_tx get the correct
+         * destination queue.  Using a helper function skips the a call to
+         * skb_tx_hash and will put the skbs in the queue we expect on their
+         * way down to the bonding driver.
+         */
+        return skb->queue_mapping;
+}
+
 static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        const struct bonding *bond = netdev_priv(dev);
+        struct bonding *bond = netdev_priv(dev);
+
+        if (TX_QUEUE_OVERRIDE(bond->params.mode)) {
+                if (!bond_slave_override(bond, skb))
+                        return NETDEV_TX_OK;
+        }
 
         switch (bond->params.mode) {
         case BOND_MODE_ROUNDROBIN:
@@ -4488,7 +4569,8 @@ static const struct net_device_ops bond_netdev_ops = {
         .ndo_open               = bond_open,
         .ndo_stop               = bond_close,
         .ndo_start_xmit         = bond_start_xmit,
-        .ndo_get_stats          = bond_get_stats,
+        .ndo_select_queue       = bond_select_queue,
+        .ndo_get_stats64        = bond_get_stats,
         .ndo_do_ioctl           = bond_do_ioctl,
         .ndo_set_multicast_list = bond_set_multicast_list,
         .ndo_change_mtu         = bond_change_mtu,
@@ -4756,6 +4838,20 @@ static int bond_check_params(struct bond_params *params)
                 }
         }
 
+        if (tx_queues < 1 || tx_queues > 255) {
+                pr_warning("Warning: tx_queues (%d) should be between "
+                           "1 and 255, resetting to %d\n",
+                           tx_queues, BOND_DEFAULT_TX_QUEUES);
+                tx_queues = BOND_DEFAULT_TX_QUEUES;
+        }
+
+        if ((all_slaves_active != 0) && (all_slaves_active != 1)) {
+                pr_warning("Warning: all_slaves_active module parameter (%d), "
+                           "not of valid value (0/1), so it was set to "
+                           "0\n", all_slaves_active);
+                all_slaves_active = 0;
+        }
+
         /* reset values for TLB/ALB */
         if ((bond_mode == BOND_MODE_TLB) ||
             (bond_mode == BOND_MODE_ALB)) {
@@ -4926,6 +5022,8 @@ static int bond_check_params(struct bond_params *params)
         params->primary[0] = 0;
         params->primary_reselect = primary_reselect_value;
         params->fail_over_mac = fail_over_mac_value;
+        params->tx_queues = tx_queues;
+        params->all_slaves_active = all_slaves_active;
 
         if (primary) {
                 strncpy(params->primary, primary, IFNAMSIZ);
@@ -5012,8 +5110,8 @@ int bond_create(struct net *net, const char *name)
 
         rtnl_lock();
 
-        bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
-                                bond_setup);
+        bond_dev = alloc_netdev_mq(sizeof(struct bonding), name ? name : "",
+                                bond_setup, tx_queues);
         if (!bond_dev) {
                 pr_err("%s: eek! can't alloc netdev!\n", name);
                 rtnl_unlock();
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index b8bec086daa..f9a034361a8 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -211,7 +211,8 @@ static ssize_t bonding_show_slaves(struct device *d,
 /*
  * Set the slaves in the current bond.  The bond interface must be
  * up for this to succeed.
- * This function is largely the same flow as bonding_update_bonds().
+ * This is supposed to be only thin wrapper for bond_enslave and bond_release.
+ * All hard work should be done there.
  */
 static ssize_t bonding_store_slaves(struct device *d,
                                     struct device_attribute *attr,
@@ -219,10 +220,8 @@ static ssize_t bonding_store_slaves(struct device *d,
 {
         char command[IFNAMSIZ + 1] = { 0, };
         char *ifname;
-        int i, res, found, ret = count;
-        u32 original_mtu;
-        struct slave *slave;
-        struct net_device *dev = NULL;
+        int res, ret = count;
+        struct net_device *dev;
         struct bonding *bond = to_bond(d);
 
         /* Quick sanity check -- is the bond interface up? */
@@ -231,8 +230,6 @@ static ssize_t bonding_store_slaves(struct device *d,
                            bond->dev->name);
         }
 
-        /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
-
         if (!rtnl_trylock())
                 return restart_syscall();
 
@@ -242,91 +239,33 @@ static ssize_t bonding_store_slaves(struct device *d,
             !dev_valid_name(ifname))
                 goto err_no_cmd;
 
-        if (command[0] == '+') {
-
-                /* Got a slave name in ifname.  Is it already in the list? */
-                found = 0;
-
-                dev = __dev_get_by_name(dev_net(bond->dev), ifname);
-                if (!dev) {
-                        pr_info("%s: Interface %s does not exist!\n",
-                                bond->dev->name, ifname);
-                        ret = -ENODEV;
-                        goto out;
-                }
-
-                if (dev->flags & IFF_UP) {
-                        pr_err("%s: Error: Unable to enslave %s because it is already up.\n",
-                               bond->dev->name, dev->name);
-                        ret = -EPERM;
-                        goto out;
-                }
-
-                read_lock(&bond->lock);
-                bond_for_each_slave(bond, slave, i)
-                        if (slave->dev == dev) {
-                                pr_err("%s: Interface %s is already enslaved!\n",
-                                       bond->dev->name, ifname);
-                                ret = -EPERM;
-                                read_unlock(&bond->lock);
-                                goto out;
-                        }
-                read_unlock(&bond->lock);
-
-                pr_info("%s: Adding slave %s.\n", bond->dev->name, ifname);
-
-                /* If this is the first slave, then we need to set
-                   the master's hardware address to be the same as the
-                   slave's. */
-                if (is_zero_ether_addr(bond->dev->dev_addr))
-                        memcpy(bond->dev->dev_addr, dev->dev_addr,
-                               dev->addr_len);
-
-                /* Set the slave's MTU to match the bond */
-                original_mtu = dev->mtu;
-                res = dev_set_mtu(dev, bond->dev->mtu);
-                if (res) {
-                        ret = res;
-                        goto out;
-                }
+        dev = __dev_get_by_name(dev_net(bond->dev), ifname);
+        if (!dev) {
+                pr_info("%s: Interface %s does not exist!\n",
+                        bond->dev->name, ifname);
+                ret = -ENODEV;
+                goto out;
+        }
 
+        switch (command[0]) {
+        case '+':
+                pr_info("%s: Adding slave %s.\n", bond->dev->name, dev->name);
                 res = bond_enslave(bond->dev, dev);
-                bond_for_each_slave(bond, slave, i)
-                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0)
-                                slave->original_mtu = original_mtu;
-                if (res)
-                        ret = res;
+                break;
 
-                goto out;
-        }
+        case '-':
+                pr_info("%s: Removing slave %s.\n", bond->dev->name, dev->name);
+                res = bond_release(bond->dev, dev);
+                break;
 
-        if (command[0] == '-') {
-                dev = NULL;
-                original_mtu = 0;
-                bond_for_each_slave(bond, slave, i)
-                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
-                                dev = slave->dev;
-                                original_mtu = slave->original_mtu;
-                                break;
-                        }
-                if (dev) {
-                        pr_info("%s: Removing slave %s\n",
-                                bond->dev->name, dev->name);
-                                res = bond_release(bond->dev, dev);
-                        if (res) {
-                                ret = res;
-                                goto out;
-                        }
-                        /* set the slave MTU to the default */
-                        dev_set_mtu(dev, original_mtu);
-                } else {
-                        pr_err("unable to remove non-existent slave %s for bond %s.\n",
-                               ifname, bond->dev->name);
-                        ret = -ENODEV;
-                }
-                goto out;
+        default:
+                goto err_no_cmd;
         }
 
+        if (res)
+                ret = res;
+        goto out;
+
 err_no_cmd:
         pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
                bond->dev->name);
@@ -1472,7 +1411,173 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 }
 static DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
 
+/*
+ * Show the queue_ids of the slaves in the current bond.
+ */
+static ssize_t bonding_show_queue_id(struct device *d,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct slave *slave;
+        int i, res = 0;
+        struct bonding *bond = to_bond(d);
+
+        if (!rtnl_trylock())
+                return restart_syscall();
 
+        read_lock(&bond->lock);
+        bond_for_each_slave(bond, slave, i) {
+                if (res > (PAGE_SIZE - 6)) {
+                        /* not enough space for another interface name */
+                        if ((PAGE_SIZE - res) > 10)
+                                res = PAGE_SIZE - 10;
+                        res += sprintf(buf + res, "++more++ ");
+                        break;
+                }
+                res += sprintf(buf + res, "%s:%d ",
+                               slave->dev->name, slave->queue_id);
+        }
+        read_unlock(&bond->lock);
+        if (res)
+                buf[res-1] = '\n'; /* eat the leftover space */
+        rtnl_unlock();
+        return res;
+}
+
+/*
+ * Set the queue_ids of the  slaves in the current bond.  The bond
+ * interface must be enslaved for this to work.
+ */
+static ssize_t bonding_store_queue_id(struct device *d,
+                                      struct device_attribute *attr,
+                                      const char *buffer, size_t count)
+{
+        struct slave *slave, *update_slave;
+        struct bonding *bond = to_bond(d);
+        u16 qid;
+        int i, ret = count;
+        char *delim;
+        struct net_device *sdev = NULL;
+
+        if (!rtnl_trylock())
+                return restart_syscall();
+
+        /* delim will point to queue id if successful */
+        delim = strchr(buffer, ':');
+        if (!delim)
+                goto err_no_cmd;
+
+        /*
+         * Terminate string that points to device name and bump it
+         * up one, so we can read the queue id there.
+         */
+        *delim = '\0';
+        if (sscanf(++delim, "%hd\n", &qid) != 1)
+                goto err_no_cmd;
+
+        /* Check buffer length, valid ifname and queue id */
+        if (strlen(buffer) > IFNAMSIZ ||
+            !dev_valid_name(buffer) ||
+            qid > bond->params.tx_queues)
+                goto err_no_cmd;
+
+        /* Get the pointer to that interface if it exists */
+        sdev = __dev_get_by_name(dev_net(bond->dev), buffer);
+        if (!sdev)
+                goto err_no_cmd;
+
+        read_lock(&bond->lock);
+
+        /* Search for thes slave and check for duplicate qids */
+        update_slave = NULL;
+        bond_for_each_slave(bond, slave, i) {
+                if (sdev == slave->dev)
+                        /*
+                         * We don't need to check the matching
+                         * slave for dups, since we're overwriting it
+                         */
+                        update_slave = slave;
+                else if (qid && qid == slave->queue_id) {
+                        goto err_no_cmd_unlock;
+                }
+        }
+
+        if (!update_slave)
+                goto err_no_cmd_unlock;
+
+        /* Actually set the qids for the slave */
+        update_slave->queue_id = qid;
+
+        read_unlock(&bond->lock);
+out:
+        rtnl_unlock();
+        return ret;
+
+err_no_cmd_unlock:
+        read_unlock(&bond->lock);
+err_no_cmd:
+        pr_info("invalid input for queue_id set for %s.\n",
+                bond->dev->name);
+        ret = -EPERM;
+        goto out;
+}
+
+static DEVICE_ATTR(queue_id, S_IRUGO | S_IWUSR, bonding_show_queue_id,
+                   bonding_store_queue_id);
+
+
+/*
+ * Show and set the all_slaves_active flag.
+ */
+static ssize_t bonding_show_slaves_active(struct device *d,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        struct bonding *bond = to_bond(d);
+
+        return sprintf(buf, "%d\n", bond->params.all_slaves_active);
+}
+
+static ssize_t bonding_store_slaves_active(struct device *d,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+        int i, new_value, ret = count;
+        struct bonding *bond = to_bond(d);
+        struct slave *slave;
+
+        if (sscanf(buf, "%d", &new_value) != 1) {
+                pr_err("%s: no all_slaves_active value specified.\n",
+                       bond->dev->name);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (new_value == bond->params.all_slaves_active)
+                goto out;
+
+        if ((new_value == 0) || (new_value == 1)) {
+                bond->params.all_slaves_active = new_value;
+        } else {
+                pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
+                        bond->dev->name, new_value);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        bond_for_each_slave(bond, slave, i) {
+                if (slave->state == BOND_STATE_BACKUP) {
+                        if (new_value)
+                                slave->dev->priv_flags &= ~IFF_SLAVE_INACTIVE;
+                        else
+                                slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
+                }
+        }
+out:
+        return count;
+}
+static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
+                   bonding_show_slaves_active, bonding_store_slaves_active);
 
 static struct attribute *per_bond_attrs[] = {
         &dev_attr_slaves.attr,
@@ -1499,6 +1604,8 @@ static struct attribute *per_bond_attrs[] = {
         &dev_attr_ad_actor_key.attr,
         &dev_attr_ad_partner_key.attr,
         &dev_attr_ad_partner_mac.attr,
+        &dev_attr_queue_id.attr,
+        &dev_attr_all_slaves_active.attr,
         NULL,
 };
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 2aa33672059..c6fdd851579 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -23,8 +23,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.6.0"
-#define DRV_RELDATE     "September 26, 2009"
+#define DRV_VERSION     "3.7.0"
+#define DRV_RELDATE     "June 2, 2010"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
@@ -60,6 +60,9 @@
                  ((mode) == BOND_MODE_TLB)          ||  \
                  ((mode) == BOND_MODE_ALB))
 
+#define TX_QUEUE_OVERRIDE(mode)                         \
+                        (((mode) == BOND_MODE_ACTIVEBACKUP) ||  \
+                         ((mode) == BOND_MODE_ROUNDROBIN))
 /*
  * Less bad way to call ioctl from within the kernel; this needs to be
  * done some other way to get the call out of interrupt context.
@@ -131,6 +134,8 @@ struct bond_params {
         char primary[IFNAMSIZ];
         int primary_reselect;
         __be32 arp_targets[BOND_MAX_ARP_TARGETS];
+        int tx_queues;
+        int all_slaves_active;
 };
 
 struct bond_parm_tbl {
@@ -159,12 +164,12 @@ struct slave {
         s8     link;    /* one of BOND_LINK_XXXX */
         s8     new_link;
         s8     state;   /* one of BOND_STATE_XXXX */
-        u32    original_flags;
         u32    original_mtu;
         u32    link_failure_count;
         u8     perm_hwaddr[ETH_ALEN];
         u16    speed;
         u8     duplex;
+        u16    queue_id;
         struct ad_slave_info ad_info; /* HUGE - better to dynamically alloc */
         struct tlb_slave_info tlb_info;
 };
@@ -291,7 +296,8 @@ static inline void bond_set_slave_inactive_flags(struct slave *slave)
         struct bonding *bond = netdev_priv(slave->dev->master);
         if (!bond_is_lb(bond))
                 slave->state = BOND_STATE_BACKUP;
-        slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
+        if (!bond->params.all_slaves_active)
+                slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
         if (slave_do_arp_validate(bond, slave))
                 slave->dev->priv_flags |= IFF_SLAVE_NEEDARP;
 }
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index 09257ca8f56..3e706f00a0d 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -174,6 +174,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data,
         struct ser_device *ser;
         int ret;
         u8 *p;
+
         ser = tty->disc_data;
 
         /*
@@ -221,6 +222,7 @@ static int handle_tx(struct ser_device *ser)
         struct tty_struct *tty;
         struct sk_buff *skb;
         int tty_wr, len, room;
+
         tty = ser->tty;
         ser->tx_started = true;
 
@@ -281,6 +283,7 @@ error:
 static int caif_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ser_device *ser;
+
         BUG_ON(dev == NULL);
         ser = netdev_priv(dev);
 
@@ -299,6 +302,7 @@ static int caif_xmit(struct sk_buff *skb, struct net_device *dev)
 static void ldisc_tx_wakeup(struct tty_struct *tty)
 {
         struct ser_device *ser;
+
         ser = tty->disc_data;
         BUG_ON(ser == NULL);
         BUG_ON(ser->tty != tty);
@@ -348,6 +352,7 @@ static void ldisc_close(struct tty_struct *tty)
         struct ser_device *ser = tty->disc_data;
         /* Remove may be called inside or outside of rtnl_lock */
         int islocked = rtnl_is_locked();
+
         if (!islocked)
                 rtnl_lock();
         /* device is freed automagically by net-sysfs */
@@ -374,6 +379,7 @@ static struct tty_ldisc_ops caif_ldisc = {
 static int register_ldisc(void)
 {
         int result;
+
         result = tty_register_ldisc(N_CAIF, &caif_ldisc);
         if (result < 0) {
                 pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF,
@@ -391,6 +397,7 @@ static const struct net_device_ops netdev_ops = {
 static void caifdev_setup(struct net_device *dev)
 {
         struct ser_device *serdev = netdev_priv(dev);
+
         dev->features = 0;
         dev->netdev_ops = &netdev_ops;
         dev->type = ARPHRD_CAIF;
@@ -410,8 +417,6 @@ static void caifdev_setup(struct net_device *dev)
 
 static int caif_net_open(struct net_device *dev)
 {
-        struct ser_device *ser;
-        ser = netdev_priv(dev);
         netif_wake_queue(dev);
         return 0;
 }
@@ -425,6 +430,7 @@ static int caif_net_close(struct net_device *dev)
 static int __init caif_ser_init(void)
 {
         int ret;
+
         ret = register_ldisc();
         debugfsdir = debugfs_create_dir("caif_serial", NULL);
         return ret;
@@ -435,6 +441,7 @@ static void __exit caif_ser_exit(void)
         struct ser_device *ser = NULL;
         struct list_head *node;
         struct list_head *_tmp;
+
         list_for_each_safe(node, _tmp, &ser_list) {
                 ser = list_entry(node, struct ser_device, node);
                 dev_close(ser->dev);
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 05b751719bd..2c5227c02fa 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -63,6 +63,16 @@ config CAN_BFIN
           To compile this driver as a module, choose M here: the
           module will be called bfin_can.
 
+config CAN_JANZ_ICAN3
+        tristate "Janz VMOD-ICAN3 Intelligent CAN controller"
+        depends on CAN_DEV && MFD_JANZ_CMODIO
+        ---help---
+          Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which
+          connects to a MODULbus carrier board.
+
+          This driver can also be built as a module. If so, the module will be
+          called janz-ican3.ko.
+
 source "drivers/net/can/mscan/Kconfig"
 
 source "drivers/net/can/sja1000/Kconfig"
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 7a702f28d01..9047cd066fe 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -15,5 +15,6 @@ obj-$(CONFIG_CAN_AT91)		+= at91_can.o
 obj-$(CONFIG_CAN_TI_HECC)       += ti_hecc.o
 obj-$(CONFIG_CAN_MCP251X)       += mcp251x.o
 obj-$(CONFIG_CAN_BFIN)          += bfin_can.o
+obj-$(CONFIG_CAN_JANZ_ICAN3)    += janz-ican3.o
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
new file mode 100644
index 00000000000..6e533dcc36c
--- /dev/null
+++ b/drivers/net/can/janz-ican3.c
@@ -0,0 +1,1830 @@
+/*
+ * Janz MODULbus VMOD-ICAN3 CAN Interface Driver
+ *
+ * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+
+#include <linux/netdevice.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/can/error.h>
+
+#include <linux/mfd/janz.h>
+
+/* the DPM has 64k of memory, organized into 256x 256 byte pages */
+#define DPM_NUM_PAGES           256
+#define DPM_PAGE_SIZE           256
+#define DPM_PAGE_ADDR(p)        ((p) * DPM_PAGE_SIZE)
+
+/* JANZ ICAN3 "old-style" host interface queue page numbers */
+#define QUEUE_OLD_CONTROL       0
+#define QUEUE_OLD_RB0           1
+#define QUEUE_OLD_RB1           2
+#define QUEUE_OLD_WB0           3
+#define QUEUE_OLD_WB1           4
+
+/* Janz ICAN3 "old-style" host interface control registers */
+#define MSYNC_PEER              0x00            /* ICAN only */
+#define MSYNC_LOCL              0x01            /* host only */
+#define TARGET_RUNNING          0x02
+
+#define MSYNC_RB0               0x01
+#define MSYNC_RB1               0x02
+#define MSYNC_RBLW              0x04
+#define MSYNC_RB_MASK           (MSYNC_RB0 | MSYNC_RB1)
+
+#define MSYNC_WB0               0x10
+#define MSYNC_WB1               0x20
+#define MSYNC_WBLW              0x40
+#define MSYNC_WB_MASK           (MSYNC_WB0 | MSYNC_WB1)
+
+/* Janz ICAN3 "new-style" host interface queue page numbers */
+#define QUEUE_TOHOST            5
+#define QUEUE_FROMHOST_MID      6
+#define QUEUE_FROMHOST_HIGH     7
+#define QUEUE_FROMHOST_LOW      8
+
+/* The first free page in the DPM is #9 */
+#define DPM_FREE_START          9
+
+/* Janz ICAN3 "new-style" and "fast" host interface descriptor flags */
+#define DESC_VALID              0x80
+#define DESC_WRAP               0x40
+#define DESC_INTERRUPT          0x20
+#define DESC_IVALID             0x10
+#define DESC_LEN(len)           (len)
+
+/* Janz ICAN3 Firmware Messages */
+#define MSG_CONNECTI            0x02
+#define MSG_DISCONNECT          0x03
+#define MSG_IDVERS              0x04
+#define MSG_MSGLOST             0x05
+#define MSG_NEWHOSTIF           0x08
+#define MSG_INQUIRY             0x0a
+#define MSG_SETAFILMASK         0x10
+#define MSG_INITFDPMQUEUE       0x11
+#define MSG_HWCONF              0x12
+#define MSG_FMSGLOST            0x15
+#define MSG_CEVTIND             0x37
+#define MSG_CBTRREQ             0x41
+#define MSG_COFFREQ             0x42
+#define MSG_CONREQ              0x43
+#define MSG_CCONFREQ            0x47
+
+/*
+ * Janz ICAN3 CAN Inquiry Message Types
+ *
+ * NOTE: there appears to be a firmware bug here. You must send
+ * NOTE: INQUIRY_STATUS and expect to receive an INQUIRY_EXTENDED
+ * NOTE: response. The controller never responds to a message with
+ * NOTE: the INQUIRY_EXTENDED subspec :(
+ */
+#define INQUIRY_STATUS          0x00
+#define INQUIRY_TERMINATION     0x01
+#define INQUIRY_EXTENDED        0x04
+
+/* Janz ICAN3 CAN Set Acceptance Filter Mask Message Types */
+#define SETAFILMASK_REJECT      0x00
+#define SETAFILMASK_FASTIF      0x02
+
+/* Janz ICAN3 CAN Hardware Configuration Message Types */
+#define HWCONF_TERMINATE_ON     0x01
+#define HWCONF_TERMINATE_OFF    0x00
+
+/* Janz ICAN3 CAN Event Indication Message Types */
+#define CEVTIND_EI              0x01
+#define CEVTIND_DOI             0x02
+#define CEVTIND_LOST            0x04
+#define CEVTIND_FULL            0x08
+#define CEVTIND_BEI             0x10
+
+#define CEVTIND_CHIP_SJA1000    0x02
+
+#define ICAN3_BUSERR_QUOTA_MAX  255
+
+/* Janz ICAN3 CAN Frame Conversion */
+#define ICAN3_ECHO      0x10
+#define ICAN3_EFF_RTR   0x40
+#define ICAN3_SFF_RTR   0x10
+#define ICAN3_EFF       0x80
+
+#define ICAN3_CAN_TYPE_MASK     0x0f
+#define ICAN3_CAN_TYPE_SFF      0x00
+#define ICAN3_CAN_TYPE_EFF      0x01
+
+#define ICAN3_CAN_DLC_MASK      0x0f
+
+/*
+ * SJA1000 Status and Error Register Definitions
+ *
+ * Copied from drivers/net/can/sja1000/sja1000.h
+ */
+
+/* status register content */
+#define SR_BS           0x80
+#define SR_ES           0x40
+#define SR_TS           0x20
+#define SR_RS           0x10
+#define SR_TCS          0x08
+#define SR_TBS          0x04
+#define SR_DOS          0x02
+#define SR_RBS          0x01
+
+#define SR_CRIT (SR_BS|SR_ES)
+
+/* ECC register */
+#define ECC_SEG         0x1F
+#define ECC_DIR         0x20
+#define ECC_ERR         6
+#define ECC_BIT         0x00
+#define ECC_FORM        0x40
+#define ECC_STUFF       0x80
+#define ECC_MASK        0xc0
+
+/* Number of buffers for use in the "new-style" host interface */
+#define ICAN3_NEW_BUFFERS       16
+
+/* Number of buffers for use in the "fast" host interface */
+#define ICAN3_TX_BUFFERS        512
+#define ICAN3_RX_BUFFERS        1024
+
+/* SJA1000 Clock Input */
+#define ICAN3_CAN_CLOCK         8000000
+
+/* Driver Name */
+#define DRV_NAME "janz-ican3"
+
+/* DPM Control Registers -- starts at offset 0x100 in the MODULbus registers */
+struct ican3_dpm_control {
+        /* window address register */
+        u8 window_address;
+        u8 unused1;
+
+        /*
+         * Read access: clear interrupt from microcontroller
+         * Write access: send interrupt to microcontroller
+         */
+        u8 interrupt;
+        u8 unused2;
+
+        /* write-only: reset all hardware on the module */
+        u8 hwreset;
+        u8 unused3;
+
+        /* write-only: generate an interrupt to the TPU */
+        u8 tpuinterrupt;
+};
+
+struct ican3_dev {
+
+        /* must be the first member */
+        struct can_priv can;
+
+        /* CAN network device */
+        struct net_device *ndev;
+        struct napi_struct napi;
+
+        /* Device for printing */
+        struct device *dev;
+
+        /* module number */
+        unsigned int num;
+
+        /* base address of registers and IRQ */
+        struct janz_cmodio_onboard_regs __iomem *ctrl;
+        struct ican3_dpm_control __iomem *dpmctrl;
+        void __iomem *dpm;
+        int irq;
+
+        /* CAN bus termination status */
+        struct completion termination_comp;
+        bool termination_enabled;
+
+        /* CAN bus error status registers */
+        struct completion buserror_comp;
+        struct can_berr_counter bec;
+
+        /* old and new style host interface */
+        unsigned int iftype;
+
+        /*
+         * Any function which changes the current DPM page must hold this
+         * lock while it is performing data accesses. This ensures that the
+         * function will not be preempted and end up reading data from a
+         * different DPM page than it expects.
+         */
+        spinlock_t lock;
+
+        /* new host interface */
+        unsigned int rx_int;
+        unsigned int rx_num;
+        unsigned int tx_num;
+
+        /* fast host interface */
+        unsigned int fastrx_start;
+        unsigned int fastrx_int;
+        unsigned int fastrx_num;
+        unsigned int fasttx_start;
+        unsigned int fasttx_num;
+
+        /* first free DPM page */
+        unsigned int free_page;
+};
+
+struct ican3_msg {
+        u8 control;
+        u8 spec;
+        __le16 len;
+        u8 data[252];
+};
+
+struct ican3_new_desc {
+        u8 control;
+        u8 pointer;
+};
+
+struct ican3_fast_desc {
+        u8 control;
+        u8 command;
+        u8 data[14];
+};
+
+/* write to the window basic address register */
+static inline void ican3_set_page(struct ican3_dev *mod, unsigned int page)
+{
+        BUG_ON(page >= DPM_NUM_PAGES);
+        iowrite8(page, &mod->dpmctrl->window_address);
+}
+
+/*
+ * ICAN3 "old-style" host interface
+ */
+
+/*
+ * Recieve a message from the ICAN3 "old-style" firmware interface
+ *
+ * LOCKING: must hold mod->lock
+ *
+ * returns 0 on success, -ENOMEM when no message exists
+ */
+static int ican3_old_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        unsigned int mbox, mbox_page;
+        u8 locl, peer, xord;
+
+        /* get the MSYNC registers */
+        ican3_set_page(mod, QUEUE_OLD_CONTROL);
+        peer = ioread8(mod->dpm + MSYNC_PEER);
+        locl = ioread8(mod->dpm + MSYNC_LOCL);
+        xord = locl ^ peer;
+
+        if ((xord & MSYNC_RB_MASK) == 0x00) {
+                dev_dbg(mod->dev, "no mbox for reading\n");
+                return -ENOMEM;
+        }
+
+        /* find the first free mbox to read */
+        if ((xord & MSYNC_RB_MASK) == MSYNC_RB_MASK)
+                mbox = (xord & MSYNC_RBLW) ? MSYNC_RB0 : MSYNC_RB1;
+        else
+                mbox = (xord & MSYNC_RB0) ? MSYNC_RB0 : MSYNC_RB1;
+
+        /* copy the message */
+        mbox_page = (mbox == MSYNC_RB0) ? QUEUE_OLD_RB0 : QUEUE_OLD_RB1;
+        ican3_set_page(mod, mbox_page);
+        memcpy_fromio(msg, mod->dpm, sizeof(*msg));
+
+        /*
+         * notify the firmware that the read buffer is available
+         * for it to fill again
+         */
+        locl ^= mbox;
+
+        ican3_set_page(mod, QUEUE_OLD_CONTROL);
+        iowrite8(locl, mod->dpm + MSYNC_LOCL);
+        return 0;
+}
+
+/*
+ * Send a message through the "old-style" firmware interface
+ *
+ * LOCKING: must hold mod->lock
+ *
+ * returns 0 on success, -ENOMEM when no free space exists
+ */
+static int ican3_old_send_msg(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        unsigned int mbox, mbox_page;
+        u8 locl, peer, xord;
+
+        /* get the MSYNC registers */
+        ican3_set_page(mod, QUEUE_OLD_CONTROL);
+        peer = ioread8(mod->dpm + MSYNC_PEER);
+        locl = ioread8(mod->dpm + MSYNC_LOCL);
+        xord = locl ^ peer;
+
+        if ((xord & MSYNC_WB_MASK) == MSYNC_WB_MASK) {
+                dev_err(mod->dev, "no mbox for writing\n");
+                return -ENOMEM;
+        }
+
+        /* calculate a free mbox to use */
+        mbox = (xord & MSYNC_WB0) ? MSYNC_WB1 : MSYNC_WB0;
+
+        /* copy the message to the DPM */
+        mbox_page = (mbox == MSYNC_WB0) ? QUEUE_OLD_WB0 : QUEUE_OLD_WB1;
+        ican3_set_page(mod, mbox_page);
+        memcpy_toio(mod->dpm, msg, sizeof(*msg));
+
+        locl ^= mbox;
+        if (mbox == MSYNC_WB1)
+                locl |= MSYNC_WBLW;
+
+        ican3_set_page(mod, QUEUE_OLD_CONTROL);
+        iowrite8(locl, mod->dpm + MSYNC_LOCL);
+        return 0;
+}
+
+/*
+ * ICAN3 "new-style" Host Interface Setup
+ */
+
+static void __devinit ican3_init_new_host_interface(struct ican3_dev *mod)
+{
+        struct ican3_new_desc desc;
+        unsigned long flags;
+        void __iomem *dst;
+        int i;
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        /* setup the internal datastructures for RX */
+        mod->rx_num = 0;
+        mod->rx_int = 0;
+
+        /* tohost queue descriptors are in page 5 */
+        ican3_set_page(mod, QUEUE_TOHOST);
+        dst = mod->dpm;
+
+        /* initialize the tohost (rx) queue descriptors: pages 9-24 */
+        for (i = 0; i < ICAN3_NEW_BUFFERS; i++) {
+                desc.control = DESC_INTERRUPT | DESC_LEN(1); /* I L=1 */
+                desc.pointer = mod->free_page;
+
+                /* set wrap flag on last buffer */
+                if (i == ICAN3_NEW_BUFFERS - 1)
+                        desc.control |= DESC_WRAP;
+
+                memcpy_toio(dst, &desc, sizeof(desc));
+                dst += sizeof(desc);
+                mod->free_page++;
+        }
+
+        /* fromhost (tx) mid queue descriptors are in page 6 */
+        ican3_set_page(mod, QUEUE_FROMHOST_MID);
+        dst = mod->dpm;
+
+        /* setup the internal datastructures for TX */
+        mod->tx_num = 0;
+
+        /* initialize the fromhost mid queue descriptors: pages 25-40 */
+        for (i = 0; i < ICAN3_NEW_BUFFERS; i++) {
+                desc.control = DESC_VALID | DESC_LEN(1); /* V L=1 */
+                desc.pointer = mod->free_page;
+
+                /* set wrap flag on last buffer */
+                if (i == ICAN3_NEW_BUFFERS - 1)
+                        desc.control |= DESC_WRAP;
+
+                memcpy_toio(dst, &desc, sizeof(desc));
+                dst += sizeof(desc);
+                mod->free_page++;
+        }
+
+        /* fromhost hi queue descriptors are in page 7 */
+        ican3_set_page(mod, QUEUE_FROMHOST_HIGH);
+        dst = mod->dpm;
+
+        /* initialize only a single buffer in the fromhost hi queue (unused) */
+        desc.control = DESC_VALID | DESC_WRAP | DESC_LEN(1); /* VW L=1 */
+        desc.pointer = mod->free_page;
+        memcpy_toio(dst, &desc, sizeof(desc));
+        mod->free_page++;
+
+        /* fromhost low queue descriptors are in page 8 */
+        ican3_set_page(mod, QUEUE_FROMHOST_LOW);
+        dst = mod->dpm;
+
+        /* initialize only a single buffer in the fromhost low queue (unused) */
+        desc.control = DESC_VALID | DESC_WRAP | DESC_LEN(1); /* VW L=1 */
+        desc.pointer = mod->free_page;
+        memcpy_toio(dst, &desc, sizeof(desc));
+        mod->free_page++;
+
+        spin_unlock_irqrestore(&mod->lock, flags);
+}
+
+/*
+ * ICAN3 Fast Host Interface Setup
+ */
+
+static void __devinit ican3_init_fast_host_interface(struct ican3_dev *mod)
+{
+        struct ican3_fast_desc desc;
+        unsigned long flags;
+        unsigned int addr;
+        void __iomem *dst;
+        int i;
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        /* save the start recv page */
+        mod->fastrx_start = mod->free_page;
+        mod->fastrx_num = 0;
+        mod->fastrx_int = 0;
+
+        /* build a single fast tohost queue descriptor */
+        memset(&desc, 0, sizeof(desc));
+        desc.control = 0x00;
+        desc.command = 1;
+
+        /* build the tohost queue descriptor ring in memory */
+        addr = 0;
+        for (i = 0; i < ICAN3_RX_BUFFERS; i++) {
+
+                /* set the wrap bit on the last buffer */
+                if (i == ICAN3_RX_BUFFERS - 1)
+                        desc.control |= DESC_WRAP;
+
+                /* switch to the correct page */
+                ican3_set_page(mod, mod->free_page);
+
+                /* copy the descriptor to the DPM */
+                dst = mod->dpm + addr;
+                memcpy_toio(dst, &desc, sizeof(desc));
+                addr += sizeof(desc);
+
+                /* move to the next page if necessary */
+                if (addr >= DPM_PAGE_SIZE) {
+                        addr = 0;
+                        mod->free_page++;
+                }
+        }
+
+        /* make sure we page-align the next queue */
+        if (addr != 0)
+                mod->free_page++;
+
+        /* save the start xmit page */
+        mod->fasttx_start = mod->free_page;
+        mod->fasttx_num = 0;
+
+        /* build a single fast fromhost queue descriptor */
+        memset(&desc, 0, sizeof(desc));
+        desc.control = DESC_VALID;
+        desc.command = 1;
+
+        /* build the fromhost queue descriptor ring in memory */
+        addr = 0;
+        for (i = 0; i < ICAN3_TX_BUFFERS; i++) {
+
+                /* set the wrap bit on the last buffer */
+                if (i == ICAN3_TX_BUFFERS - 1)
+                        desc.control |= DESC_WRAP;
+
+                /* switch to the correct page */
+                ican3_set_page(mod, mod->free_page);
+
+                /* copy the descriptor to the DPM */
+                dst = mod->dpm + addr;
+                memcpy_toio(dst, &desc, sizeof(desc));
+                addr += sizeof(desc);
+
+                /* move to the next page if necessary */
+                if (addr >= DPM_PAGE_SIZE) {
+                        addr = 0;
+                        mod->free_page++;
+                }
+        }
+
+        spin_unlock_irqrestore(&mod->lock, flags);
+}
+
+/*
+ * ICAN3 "new-style" Host Interface Message Helpers
+ */
+
+/*
+ * LOCKING: must hold mod->lock
+ */
+static int ican3_new_send_msg(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        struct ican3_new_desc desc;
+        void __iomem *desc_addr = mod->dpm + (mod->tx_num * sizeof(desc));
+
+        /* switch to the fromhost mid queue, and read the buffer descriptor */
+        ican3_set_page(mod, QUEUE_FROMHOST_MID);
+        memcpy_fromio(&desc, desc_addr, sizeof(desc));
+
+        if (!(desc.control & DESC_VALID)) {
+                dev_dbg(mod->dev, "%s: no free buffers\n", __func__);
+                return -ENOMEM;
+        }
+
+        /* switch to the data page, copy the data */
+        ican3_set_page(mod, desc.pointer);
+        memcpy_toio(mod->dpm, msg, sizeof(*msg));
+
+        /* switch back to the descriptor, set the valid bit, write it back */
+        ican3_set_page(mod, QUEUE_FROMHOST_MID);
+        desc.control ^= DESC_VALID;
+        memcpy_toio(desc_addr, &desc, sizeof(desc));
+
+        /* update the tx number */
+        mod->tx_num = (desc.control & DESC_WRAP) ? 0 : (mod->tx_num + 1);
+        return 0;
+}
+
+/*
+ * LOCKING: must hold mod->lock
+ */
+static int ican3_new_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        struct ican3_new_desc desc;
+        void __iomem *desc_addr = mod->dpm + (mod->rx_num * sizeof(desc));
+
+        /* switch to the tohost queue, and read the buffer descriptor */
+        ican3_set_page(mod, QUEUE_TOHOST);
+        memcpy_fromio(&desc, desc_addr, sizeof(desc));
+
+        if (!(desc.control & DESC_VALID)) {
+                dev_dbg(mod->dev, "%s: no buffers to recv\n", __func__);
+                return -ENOMEM;
+        }
+
+        /* switch to the data page, copy the data */
+        ican3_set_page(mod, desc.pointer);
+        memcpy_fromio(msg, mod->dpm, sizeof(*msg));
+
+        /* switch back to the descriptor, toggle the valid bit, write it back */
+        ican3_set_page(mod, QUEUE_TOHOST);
+        desc.control ^= DESC_VALID;
+        memcpy_toio(desc_addr, &desc, sizeof(desc));
+
+        /* update the rx number */
+        mod->rx_num = (desc.control & DESC_WRAP) ? 0 : (mod->rx_num + 1);
+        return 0;
+}
+
+/*
+ * Message Send / Recv Helpers
+ */
+
+static int ican3_send_msg(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        if (mod->iftype == 0)
+                ret = ican3_old_send_msg(mod, msg);
+        else
+                ret = ican3_new_send_msg(mod, msg);
+
+        spin_unlock_irqrestore(&mod->lock, flags);
+        return ret;
+}
+
+static int ican3_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        if (mod->iftype == 0)
+                ret = ican3_old_recv_msg(mod, msg);
+        else
+                ret = ican3_new_recv_msg(mod, msg);
+
+        spin_unlock_irqrestore(&mod->lock, flags);
+        return ret;
+}
+
+/*
+ * Quick Pre-constructed Messages
+ */
+
+static int __devinit ican3_msg_connect(struct ican3_dev *mod)
+{
+        struct ican3_msg msg;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_CONNECTI;
+        msg.len = cpu_to_le16(0);
+
+        return ican3_send_msg(mod, &msg);
+}
+
+static int __devexit ican3_msg_disconnect(struct ican3_dev *mod)
+{
+        struct ican3_msg msg;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_DISCONNECT;
+        msg.len = cpu_to_le16(0);
+
+        return ican3_send_msg(mod, &msg);
+}
+
+static int __devinit ican3_msg_newhostif(struct ican3_dev *mod)
+{
+        struct ican3_msg msg;
+        int ret;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_NEWHOSTIF;
+        msg.len = cpu_to_le16(0);
+
+        /* If we're not using the old interface, switching seems bogus */
+        WARN_ON(mod->iftype != 0);
+
+        ret = ican3_send_msg(mod, &msg);
+        if (ret)
+                return ret;
+
+        /* mark the module as using the new host interface */
+        mod->iftype = 1;
+        return 0;
+}
+
+static int __devinit ican3_msg_fasthostif(struct ican3_dev *mod)
+{
+        struct ican3_msg msg;
+        unsigned int addr;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_INITFDPMQUEUE;
+        msg.len = cpu_to_le16(8);
+
+        /* write the tohost queue start address */
+        addr = DPM_PAGE_ADDR(mod->fastrx_start);
+        msg.data[0] = addr & 0xff;
+        msg.data[1] = (addr >> 8) & 0xff;
+        msg.data[2] = (addr >> 16) & 0xff;
+        msg.data[3] = (addr >> 24) & 0xff;
+
+        /* write the fromhost queue start address */
+        addr = DPM_PAGE_ADDR(mod->fasttx_start);
+        msg.data[4] = addr & 0xff;
+        msg.data[5] = (addr >> 8) & 0xff;
+        msg.data[6] = (addr >> 16) & 0xff;
+        msg.data[7] = (addr >> 24) & 0xff;
+
+        /* If we're not using the new interface yet, we cannot do this */
+        WARN_ON(mod->iftype != 1);
+
+        return ican3_send_msg(mod, &msg);
+}
+
+/*
+ * Setup the CAN filter to either accept or reject all
+ * messages from the CAN bus.
+ */
+static int __devinit ican3_set_id_filter(struct ican3_dev *mod, bool accept)
+{
+        struct ican3_msg msg;
+        int ret;
+
+        /* Standard Frame Format */
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_SETAFILMASK;
+        msg.len = cpu_to_le16(5);
+        msg.data[0] = 0x00; /* IDLo LSB */
+        msg.data[1] = 0x00; /* IDLo MSB */
+        msg.data[2] = 0xff; /* IDHi LSB */
+        msg.data[3] = 0x07; /* IDHi MSB */
+
+        /* accept all frames for fast host if, or reject all frames */
+        msg.data[4] = accept ? SETAFILMASK_FASTIF : SETAFILMASK_REJECT;
+
+        ret = ican3_send_msg(mod, &msg);
+        if (ret)
+                return ret;
+
+        /* Extended Frame Format */
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_SETAFILMASK;
+        msg.len = cpu_to_le16(13);
+        msg.data[0] = 0;    /* MUX = 0 */
+        msg.data[1] = 0x00; /* IDLo LSB */
+        msg.data[2] = 0x00;
+        msg.data[3] = 0x00;
+        msg.data[4] = 0x20; /* IDLo MSB */
+        msg.data[5] = 0xff; /* IDHi LSB */
+        msg.data[6] = 0xff;
+        msg.data[7] = 0xff;
+        msg.data[8] = 0x3f; /* IDHi MSB */
+
+        /* accept all frames for fast host if, or reject all frames */
+        msg.data[9] = accept ? SETAFILMASK_FASTIF : SETAFILMASK_REJECT;
+
+        return ican3_send_msg(mod, &msg);
+}
+
+/*
+ * Bring the CAN bus online or offline
+ */
+static int ican3_set_bus_state(struct ican3_dev *mod, bool on)
+{
+        struct ican3_msg msg;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = on ? MSG_CONREQ : MSG_COFFREQ;
+        msg.len = cpu_to_le16(0);
+
+        return ican3_send_msg(mod, &msg);
+}
+
+static int ican3_set_termination(struct ican3_dev *mod, bool on)
+{
+        struct ican3_msg msg;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_HWCONF;
+        msg.len = cpu_to_le16(2);
+        msg.data[0] = 0x00;
+        msg.data[1] = on ? HWCONF_TERMINATE_ON : HWCONF_TERMINATE_OFF;
+
+        return ican3_send_msg(mod, &msg);
+}
+
+static int ican3_send_inquiry(struct ican3_dev *mod, u8 subspec)
+{
+        struct ican3_msg msg;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_INQUIRY;
+        msg.len = cpu_to_le16(2);
+        msg.data[0] = subspec;
+        msg.data[1] = 0x00;
+
+        return ican3_send_msg(mod, &msg);
+}
+
+static int ican3_set_buserror(struct ican3_dev *mod, u8 quota)
+{
+        struct ican3_msg msg;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_CCONFREQ;
+        msg.len = cpu_to_le16(2);
+        msg.data[0] = 0x00;
+        msg.data[1] = quota;
+
+        return ican3_send_msg(mod, &msg);
+}
+
+/*
+ * ICAN3 to Linux CAN Frame Conversion
+ */
+
+static void ican3_to_can_frame(struct ican3_dev *mod,
+                               struct ican3_fast_desc *desc,
+                               struct can_frame *cf)
+{
+        if ((desc->command & ICAN3_CAN_TYPE_MASK) == ICAN3_CAN_TYPE_SFF) {
+                if (desc->data[1] & ICAN3_SFF_RTR)
+                        cf->can_id |= CAN_RTR_FLAG;
+
+                cf->can_id |= desc->data[0] << 3;
+                cf->can_id |= (desc->data[1] & 0xe0) >> 5;
+                cf->can_dlc = desc->data[1] & ICAN3_CAN_DLC_MASK;
+                memcpy(cf->data, &desc->data[2], sizeof(cf->data));
+        } else {
+                cf->can_dlc = desc->data[0] & ICAN3_CAN_DLC_MASK;
+                if (desc->data[0] & ICAN3_EFF_RTR)
+                        cf->can_id |= CAN_RTR_FLAG;
+
+                if (desc->data[0] & ICAN3_EFF) {
+                        cf->can_id |= CAN_EFF_FLAG;
+                        cf->can_id |= desc->data[2] << 21; /* 28-21 */
+                        cf->can_id |= desc->data[3] << 13; /* 20-13 */
+                        cf->can_id |= desc->data[4] << 5;  /* 12-5  */
+                        cf->can_id |= (desc->data[5] & 0xf8) >> 3;
+                } else {
+                        cf->can_id |= desc->data[2] << 3;  /* 10-3  */
+                        cf->can_id |= desc->data[3] >> 5;  /* 2-0   */
+                }
+
+                memcpy(cf->data, &desc->data[6], sizeof(cf->data));
+        }
+}
+
+static void can_frame_to_ican3(struct ican3_dev *mod,
+                               struct can_frame *cf,
+                               struct ican3_fast_desc *desc)
+{
+        /* clear out any stale data in the descriptor */
+        memset(desc->data, 0, sizeof(desc->data));
+
+        /* we always use the extended format, with the ECHO flag set */
+        desc->command = ICAN3_CAN_TYPE_EFF;
+        desc->data[0] |= cf->can_dlc;
+        desc->data[1] |= ICAN3_ECHO;
+
+        if (cf->can_id & CAN_RTR_FLAG)
+                desc->data[0] |= ICAN3_EFF_RTR;
+
+        /* pack the id into the correct places */
+        if (cf->can_id & CAN_EFF_FLAG) {
+                desc->data[0] |= ICAN3_EFF;
+                desc->data[2] = (cf->can_id & 0x1fe00000) >> 21; /* 28-21 */
+                desc->data[3] = (cf->can_id & 0x001fe000) >> 13; /* 20-13 */
+                desc->data[4] = (cf->can_id & 0x00001fe0) >> 5;  /* 12-5  */
+                desc->data[5] = (cf->can_id & 0x0000001f) << 3;  /* 4-0   */
+        } else {
+                desc->data[2] = (cf->can_id & 0x7F8) >> 3; /* bits 10-3 */
+                desc->data[3] = (cf->can_id & 0x007) << 5; /* bits 2-0  */
+        }
+
+        /* copy the data bits into the descriptor */
+        memcpy(&desc->data[6], cf->data, sizeof(cf->data));
+}
+
+/*
+ * Interrupt Handling
+ */
+
+/*
+ * Handle an ID + Version message response from the firmware. We never generate
+ * this message in production code, but it is very useful when debugging to be
+ * able to display this message.
+ */
+static void ican3_handle_idvers(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        dev_dbg(mod->dev, "IDVERS response: %s\n", msg->data);
+}
+
+static void ican3_handle_msglost(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        struct net_device *dev = mod->ndev;
+        struct net_device_stats *stats = &dev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+
+        /*
+         * Report that communication messages with the microcontroller firmware
+         * are being lost. These are never CAN frames, so we do not generate an
+         * error frame for userspace
+         */
+        if (msg->spec == MSG_MSGLOST) {
+                dev_err(mod->dev, "lost %d control messages\n", msg->data[0]);
+                return;
+        }
+
+        /*
+         * Oops, this indicates that we have lost messages in the fast queue,
+         * which are exclusively CAN messages. Our driver isn't reading CAN
+         * frames fast enough.
+         *
+         * We'll pretend that the SJA1000 told us that it ran out of buffer
+         * space, because there is not a better message for this.
+         */
+        skb = alloc_can_err_skb(dev, &cf);
+        if (skb) {
+                cf->can_id |= CAN_ERR_CRTL;
+                cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+                stats->rx_errors++;
+                stats->rx_bytes += cf->can_dlc;
+                netif_rx(skb);
+        }
+}
+
+/*
+ * Handle CAN Event Indication Messages from the firmware
+ *
+ * The ICAN3 firmware provides the values of some SJA1000 registers when it
+ * generates this message. The code below is largely copied from the
+ * drivers/net/can/sja1000/sja1000.c file, and adapted as necessary
+ */
+static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        struct net_device *dev = mod->ndev;
+        struct net_device_stats *stats = &dev->stats;
+        enum can_state state = mod->can.state;
+        u8 status, isrc, rxerr, txerr;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+
+        /* we can only handle the SJA1000 part */
+        if (msg->data[1] != CEVTIND_CHIP_SJA1000) {
+                dev_err(mod->dev, "unable to handle errors on non-SJA1000\n");
+                return -ENODEV;
+        }
+
+        /* check the message length for sanity */
+        if (le16_to_cpu(msg->len) < 6) {
+                dev_err(mod->dev, "error message too short\n");
+                return -EINVAL;
+        }
+
+        skb = alloc_can_err_skb(dev, &cf);
+        if (skb == NULL)
+                return -ENOMEM;
+
+        isrc = msg->data[0];
+        status = msg->data[3];
+        rxerr = msg->data[4];
+        txerr = msg->data[5];
+
+        /* data overrun interrupt */
+        if (isrc == CEVTIND_DOI || isrc == CEVTIND_LOST) {
+                dev_dbg(mod->dev, "data overrun interrupt\n");
+                cf->can_id |= CAN_ERR_CRTL;
+                cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+                stats->rx_over_errors++;
+                stats->rx_errors++;
+        }
+
+        /* error warning + passive interrupt */
+        if (isrc == CEVTIND_EI) {
+                dev_dbg(mod->dev, "error warning + passive interrupt\n");
+                if (status & SR_BS) {
+                        state = CAN_STATE_BUS_OFF;
+                        cf->can_id |= CAN_ERR_BUSOFF;
+                        can_bus_off(dev);
+                } else if (status & SR_ES) {
+                        if (rxerr >= 128 || txerr >= 128)
+                                state = CAN_STATE_ERROR_PASSIVE;
+                        else
+                                state = CAN_STATE_ERROR_WARNING;
+                } else {
+                        state = CAN_STATE_ERROR_ACTIVE;
+                }
+        }
+
+        /* bus error interrupt */
+        if (isrc == CEVTIND_BEI) {
+                u8 ecc = msg->data[2];
+
+                dev_dbg(mod->dev, "bus error interrupt\n");
+                mod->can.can_stats.bus_error++;
+                stats->rx_errors++;
+                cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+
+                switch (ecc & ECC_MASK) {
+                case ECC_BIT:
+                        cf->data[2] |= CAN_ERR_PROT_BIT;
+                        break;
+                case ECC_FORM:
+                        cf->data[2] |= CAN_ERR_PROT_FORM;
+                        break;
+                case ECC_STUFF:
+                        cf->data[2] |= CAN_ERR_PROT_STUFF;
+                        break;
+                default:
+                        cf->data[2] |= CAN_ERR_PROT_UNSPEC;
+                        cf->data[3] = ecc & ECC_SEG;
+                        break;
+                }
+
+                if ((ecc & ECC_DIR) == 0)
+                        cf->data[2] |= CAN_ERR_PROT_TX;
+
+                cf->data[6] = txerr;
+                cf->data[7] = rxerr;
+        }
+
+        if (state != mod->can.state && (state == CAN_STATE_ERROR_WARNING ||
+                                        state == CAN_STATE_ERROR_PASSIVE)) {
+                cf->can_id |= CAN_ERR_CRTL;
+                if (state == CAN_STATE_ERROR_WARNING) {
+                        mod->can.can_stats.error_warning++;
+                        cf->data[1] = (txerr > rxerr) ?
+                                CAN_ERR_CRTL_TX_WARNING :
+                                CAN_ERR_CRTL_RX_WARNING;
+                } else {
+                        mod->can.can_stats.error_passive++;
+                        cf->data[1] = (txerr > rxerr) ?
+                                CAN_ERR_CRTL_TX_PASSIVE :
+                                CAN_ERR_CRTL_RX_PASSIVE;
+                }
+
+                cf->data[6] = txerr;
+                cf->data[7] = rxerr;
+        }
+
+        mod->can.state = state;
+        stats->rx_errors++;
+        stats->rx_bytes += cf->can_dlc;
+        netif_rx(skb);
+        return 0;
+}
+
+static void ican3_handle_inquiry(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        switch (msg->data[0]) {
+        case INQUIRY_STATUS:
+        case INQUIRY_EXTENDED:
+                mod->bec.rxerr = msg->data[5];
+                mod->bec.txerr = msg->data[6];
+                complete(&mod->buserror_comp);
+                break;
+        case INQUIRY_TERMINATION:
+                mod->termination_enabled = msg->data[6] & HWCONF_TERMINATE_ON;
+                complete(&mod->termination_comp);
+                break;
+        default:
+                dev_err(mod->dev, "recieved an unknown inquiry response\n");
+                break;
+        }
+}
+
+static void ican3_handle_unknown_message(struct ican3_dev *mod,
+                                        struct ican3_msg *msg)
+{
+        dev_warn(mod->dev, "recieved unknown message: spec 0x%.2x length %d\n",
+                           msg->spec, le16_to_cpu(msg->len));
+}
+
+/*
+ * Handle a control message from the firmware
+ */
+static void ican3_handle_message(struct ican3_dev *mod, struct ican3_msg *msg)
+{
+        dev_dbg(mod->dev, "%s: modno %d spec 0x%.2x len %d bytes\n", __func__,
+                           mod->num, msg->spec, le16_to_cpu(msg->len));
+
+        switch (msg->spec) {
+        case MSG_IDVERS:
+                ican3_handle_idvers(mod, msg);
+                break;
+        case MSG_MSGLOST:
+        case MSG_FMSGLOST:
+                ican3_handle_msglost(mod, msg);
+                break;
+        case MSG_CEVTIND:
+                ican3_handle_cevtind(mod, msg);
+                break;
+        case MSG_INQUIRY:
+                ican3_handle_inquiry(mod, msg);
+                break;
+        default:
+                ican3_handle_unknown_message(mod, msg);
+                break;
+        }
+}
+
+/*
+ * Check that there is room in the TX ring to transmit another skb
+ *
+ * LOCKING: must hold mod->lock
+ */
+static bool ican3_txok(struct ican3_dev *mod)
+{
+        struct ican3_fast_desc __iomem *desc;
+        u8 control;
+
+        /* copy the control bits of the descriptor */
+        ican3_set_page(mod, mod->fasttx_start + (mod->fasttx_num / 16));
+        desc = mod->dpm + ((mod->fasttx_num % 16) * sizeof(*desc));
+        control = ioread8(&desc->control);
+
+        /* if the control bits are not valid, then we have no more space */
+        if (!(control & DESC_VALID))
+                return false;
+
+        return true;
+}
+
+/*
+ * Recieve one CAN frame from the hardware
+ *
+ * This works like the core of a NAPI function, but is intended to be called
+ * from workqueue context instead. This driver already needs a workqueue to
+ * process control messages, so we use the workqueue instead of using NAPI.
+ * This was done to simplify locking.
+ *
+ * CONTEXT: must be called from user context
+ */
+static int ican3_recv_skb(struct ican3_dev *mod)
+{
+        struct net_device *ndev = mod->ndev;
+        struct net_device_stats *stats = &ndev->stats;
+        struct ican3_fast_desc desc;
+        void __iomem *desc_addr;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        /* copy the whole descriptor */
+        ican3_set_page(mod, mod->fastrx_start + (mod->fastrx_num / 16));
+        desc_addr = mod->dpm + ((mod->fastrx_num % 16) * sizeof(desc));
+        memcpy_fromio(&desc, desc_addr, sizeof(desc));
+
+        spin_unlock_irqrestore(&mod->lock, flags);
+
+        /* check that we actually have a CAN frame */
+        if (!(desc.control & DESC_VALID))
+                return -ENOBUFS;
+
+        /* allocate an skb */
+        skb = alloc_can_skb(ndev, &cf);
+        if (unlikely(skb == NULL)) {
+                stats->rx_dropped++;
+                goto err_noalloc;
+        }
+
+        /* convert the ICAN3 frame into Linux CAN format */
+        ican3_to_can_frame(mod, &desc, cf);
+
+        /* receive the skb, update statistics */
+        netif_receive_skb(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+
+err_noalloc:
+        /* toggle the valid bit and return the descriptor to the ring */
+        desc.control ^= DESC_VALID;
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        ican3_set_page(mod, mod->fastrx_start + (mod->fastrx_num / 16));
+        memcpy_toio(desc_addr, &desc, 1);
+
+        /* update the next buffer pointer */
+        mod->fastrx_num = (desc.control & DESC_WRAP) ? 0
+                                                     : (mod->fastrx_num + 1);
+
+        /* there are still more buffers to process */
+        spin_unlock_irqrestore(&mod->lock, flags);
+        return 0;
+}
+
+static int ican3_napi(struct napi_struct *napi, int budget)
+{
+        struct ican3_dev *mod = container_of(napi, struct ican3_dev, napi);
+        struct ican3_msg msg;
+        unsigned long flags;
+        int received = 0;
+        int ret;
+
+        /* process all communication messages */
+        while (true) {
+                ret = ican3_recv_msg(mod, &msg);
+                if (ret)
+                        break;
+
+                ican3_handle_message(mod, &msg);
+        }
+
+        /* process all CAN frames from the fast interface */
+        while (received < budget) {
+                ret = ican3_recv_skb(mod);
+                if (ret)
+                        break;
+
+                received++;
+        }
+
+        /* We have processed all packets that the adapter had, but it
+         * was less than our budget, stop polling */
+        if (received < budget)
+                napi_complete(napi);
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        /* Wake up the transmit queue if necessary */
+        if (netif_queue_stopped(mod->ndev) && ican3_txok(mod))
+                netif_wake_queue(mod->ndev);
+
+        spin_unlock_irqrestore(&mod->lock, flags);
+
+        /* re-enable interrupt generation */
+        iowrite8(1 << mod->num, &mod->ctrl->int_enable);
+        return received;
+}
+
+static irqreturn_t ican3_irq(int irq, void *dev_id)
+{
+        struct ican3_dev *mod = dev_id;
+        u8 stat;
+
+        /*
+         * The interrupt status register on this device reports interrupts
+         * as zeroes instead of using ones like most other devices
+         */
+        stat = ioread8(&mod->ctrl->int_disable) & (1 << mod->num);
+        if (stat == (1 << mod->num))
+                return IRQ_NONE;
+
+        /* clear the MODULbus interrupt from the microcontroller */
+        ioread8(&mod->dpmctrl->interrupt);
+
+        /* disable interrupt generation, schedule the NAPI poller */
+        iowrite8(1 << mod->num, &mod->ctrl->int_disable);
+        napi_schedule(&mod->napi);
+        return IRQ_HANDLED;
+}
+
+/*
+ * Firmware reset, startup, and shutdown
+ */
+
+/*
+ * Reset an ICAN module to its power-on state
+ *
+ * CONTEXT: no network device registered
+ * LOCKING: work function disabled
+ */
+static int ican3_reset_module(struct ican3_dev *mod)
+{
+        u8 val = 1 << mod->num;
+        unsigned long start;
+        u8 runold, runnew;
+
+        /* disable interrupts so no more work is scheduled */
+        iowrite8(1 << mod->num, &mod->ctrl->int_disable);
+
+        /* flush any pending work */
+        flush_scheduled_work();
+
+        /* the first unallocated page in the DPM is #9 */
+        mod->free_page = DPM_FREE_START;
+
+        ican3_set_page(mod, QUEUE_OLD_CONTROL);
+        runold = ioread8(mod->dpm + TARGET_RUNNING);
+
+        /* reset the module */
+        iowrite8(val, &mod->ctrl->reset_assert);
+        iowrite8(val, &mod->ctrl->reset_deassert);
+
+        /* wait until the module has finished resetting and is running */
+        start = jiffies;
+        do {
+                ican3_set_page(mod, QUEUE_OLD_CONTROL);
+                runnew = ioread8(mod->dpm + TARGET_RUNNING);
+                if (runnew == (runold ^ 0xff))
+                        return 0;
+
+                msleep(10);
+        } while (time_before(jiffies, start + HZ / 4));
+
+        dev_err(mod->dev, "failed to reset CAN module\n");
+        return -ETIMEDOUT;
+}
+
+static void __devexit ican3_shutdown_module(struct ican3_dev *mod)
+{
+        ican3_msg_disconnect(mod);
+        ican3_reset_module(mod);
+}
+
+/*
+ * Startup an ICAN module, bringing it into fast mode
+ */
+static int __devinit ican3_startup_module(struct ican3_dev *mod)
+{
+        int ret;
+
+        ret = ican3_reset_module(mod);
+        if (ret) {
+                dev_err(mod->dev, "unable to reset module\n");
+                return ret;
+        }
+
+        /* re-enable interrupts so we can send messages */
+        iowrite8(1 << mod->num, &mod->ctrl->int_enable);
+
+        ret = ican3_msg_connect(mod);
+        if (ret) {
+                dev_err(mod->dev, "unable to connect to module\n");
+                return ret;
+        }
+
+        ican3_init_new_host_interface(mod);
+        ret = ican3_msg_newhostif(mod);
+        if (ret) {
+                dev_err(mod->dev, "unable to switch to new-style interface\n");
+                return ret;
+        }
+
+        /* default to "termination on" */
+        ret = ican3_set_termination(mod, true);
+        if (ret) {
+                dev_err(mod->dev, "unable to enable termination\n");
+                return ret;
+        }
+
+        /* default to "bus errors enabled" */
+        ret = ican3_set_buserror(mod, ICAN3_BUSERR_QUOTA_MAX);
+        if (ret) {
+                dev_err(mod->dev, "unable to set bus-error\n");
+                return ret;
+        }
+
+        ican3_init_fast_host_interface(mod);
+        ret = ican3_msg_fasthostif(mod);
+        if (ret) {
+                dev_err(mod->dev, "unable to switch to fast host interface\n");
+                return ret;
+        }
+
+        ret = ican3_set_id_filter(mod, true);
+        if (ret) {
+                dev_err(mod->dev, "unable to set acceptance filter\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+/*
+ * CAN Network Device
+ */
+
+static int ican3_open(struct net_device *ndev)
+{
+        struct ican3_dev *mod = netdev_priv(ndev);
+        u8 quota;
+        int ret;
+
+        /* open the CAN layer */
+        ret = open_candev(ndev);
+        if (ret) {
+                dev_err(mod->dev, "unable to start CAN layer\n");
+                return ret;
+        }
+
+        /* set the bus error generation state appropriately */
+        if (mod->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
+                quota = ICAN3_BUSERR_QUOTA_MAX;
+        else
+                quota = 0;
+
+        ret = ican3_set_buserror(mod, quota);
+        if (ret) {
+                dev_err(mod->dev, "unable to set bus-error\n");
+                close_candev(ndev);
+                return ret;
+        }
+
+        /* bring the bus online */
+        ret = ican3_set_bus_state(mod, true);
+        if (ret) {
+                dev_err(mod->dev, "unable to set bus-on\n");
+                close_candev(ndev);
+                return ret;
+        }
+
+        /* start up the network device */
+        mod->can.state = CAN_STATE_ERROR_ACTIVE;
+        netif_start_queue(ndev);
+
+        return 0;
+}
+
+static int ican3_stop(struct net_device *ndev)
+{
+        struct ican3_dev *mod = netdev_priv(ndev);
+        int ret;
+
+        /* stop the network device xmit routine */
+        netif_stop_queue(ndev);
+        mod->can.state = CAN_STATE_STOPPED;
+
+        /* bring the bus offline, stop receiving packets */
+        ret = ican3_set_bus_state(mod, false);
+        if (ret) {
+                dev_err(mod->dev, "unable to set bus-off\n");
+                return ret;
+        }
+
+        /* close the CAN layer */
+        close_candev(ndev);
+        return 0;
+}
+
+static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
+{
+        struct ican3_dev *mod = netdev_priv(ndev);
+        struct net_device_stats *stats = &ndev->stats;
+        struct can_frame *cf = (struct can_frame *)skb->data;
+        struct ican3_fast_desc desc;
+        void __iomem *desc_addr;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mod->lock, flags);
+
+        /* check that we can actually transmit */
+        if (!ican3_txok(mod)) {
+                dev_err(mod->dev, "no free descriptors, stopping queue\n");
+                netif_stop_queue(ndev);
+                spin_unlock_irqrestore(&mod->lock, flags);
+                return NETDEV_TX_BUSY;
+        }
+
+        /* copy the control bits of the descriptor */
+        ican3_set_page(mod, mod->fasttx_start + (mod->fasttx_num / 16));
+        desc_addr = mod->dpm + ((mod->fasttx_num % 16) * sizeof(desc));
+        memset(&desc, 0, sizeof(desc));
+        memcpy_fromio(&desc, desc_addr, 1);
+
+        /* convert the Linux CAN frame into ICAN3 format */
+        can_frame_to_ican3(mod, cf, &desc);
+
+        /*
+         * the programming manual says that you must set the IVALID bit, then
+         * interrupt, then set the valid bit. Quite weird, but it seems to be
+         * required for this to work
+         */
+        desc.control |= DESC_IVALID;
+        memcpy_toio(desc_addr, &desc, sizeof(desc));
+
+        /* generate a MODULbus interrupt to the microcontroller */
+        iowrite8(0x01, &mod->dpmctrl->interrupt);
+
+        desc.control ^= DESC_VALID;
+        memcpy_toio(desc_addr, &desc, sizeof(desc));
+
+        /* update the next buffer pointer */
+        mod->fasttx_num = (desc.control & DESC_WRAP) ? 0
+                                                     : (mod->fasttx_num + 1);
+
+        /* update statistics */
+        stats->tx_packets++;
+        stats->tx_bytes += cf->can_dlc;
+        kfree_skb(skb);
+
+        /*
+         * This hardware doesn't have TX-done notifications, so we'll try and
+         * emulate it the best we can using ECHO skbs. Get the next TX
+         * descriptor, and see if we have room to send. If not, stop the queue.
+         * It will be woken when the ECHO skb for the current packet is recv'd.
+         */
+
+        /* copy the control bits of the descriptor */
+        if (!ican3_txok(mod))
+                netif_stop_queue(ndev);
+
+        spin_unlock_irqrestore(&mod->lock, flags);
+        return NETDEV_TX_OK;
+}
+
+static const struct net_device_ops ican3_netdev_ops = {
+        .ndo_open       = ican3_open,
+        .ndo_stop       = ican3_stop,
+        .ndo_start_xmit = ican3_xmit,
+};
+
+/*
+ * Low-level CAN Device
+ */
+
+/* This structure was stolen from drivers/net/can/sja1000/sja1000.c */
+static struct can_bittiming_const ican3_bittiming_const = {
+        .name = DRV_NAME,
+        .tseg1_min = 1,
+        .tseg1_max = 16,
+        .tseg2_min = 1,
+        .tseg2_max = 8,
+        .sjw_max = 4,
+        .brp_min = 1,
+        .brp_max = 64,
+        .brp_inc = 1,
+};
+
+/*
+ * This routine was stolen from drivers/net/can/sja1000/sja1000.c
+ *
+ * The bittiming register command for the ICAN3 just sets the bit timing
+ * registers on the SJA1000 chip directly
+ */
+static int ican3_set_bittiming(struct net_device *ndev)
+{
+        struct ican3_dev *mod = netdev_priv(ndev);
+        struct can_bittiming *bt = &mod->can.bittiming;
+        struct ican3_msg msg;
+        u8 btr0, btr1;
+
+        btr0 = ((bt->brp - 1) & 0x3f) | (((bt->sjw - 1) & 0x3) << 6);
+        btr1 = ((bt->prop_seg + bt->phase_seg1 - 1) & 0xf) |
+                (((bt->phase_seg2 - 1) & 0x7) << 4);
+        if (mod->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
+                btr1 |= 0x80;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.spec = MSG_CBTRREQ;
+        msg.len = cpu_to_le16(4);
+        msg.data[0] = 0x00;
+        msg.data[1] = 0x00;
+        msg.data[2] = btr0;
+        msg.data[3] = btr1;
+
+        return ican3_send_msg(mod, &msg);
+}
+
+static int ican3_set_mode(struct net_device *ndev, enum can_mode mode)
+{
+        struct ican3_dev *mod = netdev_priv(ndev);
+        int ret;
+
+        if (mode != CAN_MODE_START)
+                return -ENOTSUPP;
+
+        /* bring the bus online */
+        ret = ican3_set_bus_state(mod, true);
+        if (ret) {
+                dev_err(mod->dev, "unable to set bus-on\n");
+                return ret;
+        }
+
+        /* start up the network device */
+        mod->can.state = CAN_STATE_ERROR_ACTIVE;
+
+        if (netif_queue_stopped(ndev))
+                netif_wake_queue(ndev);
+
+        return 0;
+}
+
+static int ican3_get_berr_counter(const struct net_device *ndev,
+                                  struct can_berr_counter *bec)
+{
+        struct ican3_dev *mod = netdev_priv(ndev);
+        int ret;
+
+        ret = ican3_send_inquiry(mod, INQUIRY_STATUS);
+        if (ret)
+                return ret;
+
+        ret = wait_for_completion_timeout(&mod->buserror_comp, HZ);
+        if (ret <= 0) {
+                dev_info(mod->dev, "%s timed out\n", __func__);
+                return -ETIMEDOUT;
+        }
+
+        bec->rxerr = mod->bec.rxerr;
+        bec->txerr = mod->bec.txerr;
+        return 0;
+}
+
+/*
+ * Sysfs Attributes
+ */
+
+static ssize_t ican3_sysfs_show_term(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct ican3_dev *mod = netdev_priv(to_net_dev(dev));
+        int ret;
+
+        ret = ican3_send_inquiry(mod, INQUIRY_TERMINATION);
+        if (ret)
+                return ret;
+
+        ret = wait_for_completion_timeout(&mod->termination_comp, HZ);
+        if (ret <= 0) {
+                dev_info(mod->dev, "%s timed out\n", __func__);
+                return -ETIMEDOUT;
+        }
+
+        return snprintf(buf, PAGE_SIZE, "%u\n", mod->termination_enabled);
+}
+
+static ssize_t ican3_sysfs_set_term(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
+{
+        struct ican3_dev *mod = netdev_priv(to_net_dev(dev));
+        unsigned long enable;
+        int ret;
+
+        if (strict_strtoul(buf, 0, &enable))
+                return -EINVAL;
+
+        ret = ican3_set_termination(mod, enable);
+        if (ret)
+                return ret;
+
+        return count;
+}
+
+static DEVICE_ATTR(termination, S_IWUGO | S_IRUGO, ican3_sysfs_show_term,
+                                                   ican3_sysfs_set_term);
+
+static struct attribute *ican3_sysfs_attrs[] = {
+        &dev_attr_termination.attr,
+        NULL,
+};
+
+static struct attribute_group ican3_sysfs_attr_group = {
+        .attrs = ican3_sysfs_attrs,
+};
+
+/*
+ * PCI Subsystem
+ */
+
+static int __devinit ican3_probe(struct platform_device *pdev)
+{
+        struct janz_platform_data *pdata;
+        struct net_device *ndev;
+        struct ican3_dev *mod;
+        struct resource *res;
+        struct device *dev;
+        int ret;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata)
+                return -ENXIO;
+
+        dev_dbg(&pdev->dev, "probe: module number %d\n", pdata->modno);
+
+        /* save the struct device for printing */
+        dev = &pdev->dev;
+
+        /* allocate the CAN device and private data */
+        ndev = alloc_candev(sizeof(*mod), 0);
+        if (!ndev) {
+                dev_err(dev, "unable to allocate CANdev\n");
+                ret = -ENOMEM;
+                goto out_return;
+        }
+
+        platform_set_drvdata(pdev, ndev);
+        mod = netdev_priv(ndev);
+        mod->ndev = ndev;
+        mod->dev = &pdev->dev;
+        mod->num = pdata->modno;
+        netif_napi_add(ndev, &mod->napi, ican3_napi, ICAN3_RX_BUFFERS);
+        spin_lock_init(&mod->lock);
+        init_completion(&mod->termination_comp);
+        init_completion(&mod->buserror_comp);
+
+        /* setup device-specific sysfs attributes */
+        ndev->sysfs_groups[0] = &ican3_sysfs_attr_group;
+
+        /* the first unallocated page in the DPM is 9 */
+        mod->free_page = DPM_FREE_START;
+
+        ndev->netdev_ops = &ican3_netdev_ops;
+        ndev->flags |= IFF_ECHO;
+        SET_NETDEV_DEV(ndev, &pdev->dev);
+
+        mod->can.clock.freq = ICAN3_CAN_CLOCK;
+        mod->can.bittiming_const = &ican3_bittiming_const;
+        mod->can.do_set_bittiming = ican3_set_bittiming;
+        mod->can.do_set_mode = ican3_set_mode;
+        mod->can.do_get_berr_counter = ican3_get_berr_counter;
+        mod->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES
+                                    | CAN_CTRLMODE_BERR_REPORTING;
+
+        /* find our IRQ number */
+        mod->irq = platform_get_irq(pdev, 0);
+        if (mod->irq < 0) {
+                dev_err(dev, "IRQ line not found\n");
+                ret = -ENODEV;
+                goto out_free_ndev;
+        }
+
+        ndev->irq = mod->irq;
+
+        /* get access to the MODULbus registers for this module */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(dev, "MODULbus registers not found\n");
+                ret = -ENODEV;
+                goto out_free_ndev;
+        }
+
+        mod->dpm = ioremap(res->start, resource_size(res));
+        if (!mod->dpm) {
+                dev_err(dev, "MODULbus registers not ioremap\n");
+                ret = -ENOMEM;
+                goto out_free_ndev;
+        }
+
+        mod->dpmctrl = mod->dpm + DPM_PAGE_SIZE;
+
+        /* get access to the control registers for this module */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!res) {
+                dev_err(dev, "CONTROL registers not found\n");
+                ret = -ENODEV;
+                goto out_iounmap_dpm;
+        }
+
+        mod->ctrl = ioremap(res->start, resource_size(res));
+        if (!mod->ctrl) {
+                dev_err(dev, "CONTROL registers not ioremap\n");
+                ret = -ENOMEM;
+                goto out_iounmap_dpm;
+        }
+
+        /* disable our IRQ, then hookup the IRQ handler */
+        iowrite8(1 << mod->num, &mod->ctrl->int_disable);
+        ret = request_irq(mod->irq, ican3_irq, IRQF_SHARED, DRV_NAME, mod);
+        if (ret) {
+                dev_err(dev, "unable to request IRQ\n");
+                goto out_iounmap_ctrl;
+        }
+
+        /* reset and initialize the CAN controller into fast mode */
+        napi_enable(&mod->napi);
+        ret = ican3_startup_module(mod);
+        if (ret) {
+                dev_err(dev, "%s: unable to start CANdev\n", __func__);
+                goto out_free_irq;
+        }
+
+        /* register with the Linux CAN layer */
+        ret = register_candev(ndev);
+        if (ret) {
+                dev_err(dev, "%s: unable to register CANdev\n", __func__);
+                goto out_free_irq;
+        }
+
+        dev_info(dev, "module %d: registered CAN device\n", pdata->modno);
+        return 0;
+
+out_free_irq:
+        napi_disable(&mod->napi);
+        iowrite8(1 << mod->num, &mod->ctrl->int_disable);
+        free_irq(mod->irq, mod);
+out_iounmap_ctrl:
+        iounmap(mod->ctrl);
+out_iounmap_dpm:
+        iounmap(mod->dpm);
+out_free_ndev:
+        free_candev(ndev);
+out_return:
+        return ret;
+}
+
+static int __devexit ican3_remove(struct platform_device *pdev)
+{
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct ican3_dev *mod = netdev_priv(ndev);
+
+        /* unregister the netdevice, stop interrupts */
+        unregister_netdev(ndev);
+        napi_disable(&mod->napi);
+        iowrite8(1 << mod->num, &mod->ctrl->int_disable);
+        free_irq(mod->irq, mod);
+
+        /* put the module into reset */
+        ican3_shutdown_module(mod);
+
+        /* unmap all registers */
+        iounmap(mod->ctrl);
+        iounmap(mod->dpm);
+
+        free_candev(ndev);
+
+        return 0;
+}
+
+static struct platform_driver ican3_driver = {
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ican3_probe,
+        .remove         = __devexit_p(ican3_remove),
+};
+
+static int __init ican3_init(void)
+{
+        return platform_driver_register(&ican3_driver);
+}
+
+static void __exit ican3_exit(void)
+{
+        platform_driver_unregister(&ican3_driver);
+}
+
+MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
+MODULE_DESCRIPTION("Janz MODULbus VMOD-ICAN3 Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:janz-ican3");
+
+module_init(ican3_init);
+module_exit(ican3_exit);
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 225fd147774..af753936e83 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -73,7 +73,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
         else
                 *mscan_clksrc = MSCAN_CLKSRC_XTAL;
 
-        freq = mpc5xxx_get_bus_frequency(ofdev->node);
+        freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
         if (!freq)
                 return 0;
 
@@ -152,7 +152,7 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
         }
 
         /* Determine the MSCAN device index from the physical address */
-        pval = of_get_property(ofdev->node, "reg", &plen);
+        pval = of_get_property(ofdev->dev.of_node, "reg", &plen);
         BUG_ON(!pval || plen < sizeof(*pval));
         clockidx = (*pval & 0x80) ? 1 : 0;
         if (*pval & 0x2000)
@@ -168,11 +168,11 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
          */
         if (clock_name && !strcmp(clock_name, "ip")) {
                 *mscan_clksrc = MSCAN_CLKSRC_IPS;
-                freq = mpc5xxx_get_bus_frequency(ofdev->node);
+                freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
         } else {
                 *mscan_clksrc = MSCAN_CLKSRC_BUS;
 
-                pval = of_get_property(ofdev->node,
+                pval = of_get_property(ofdev->dev.of_node,
                                        "fsl,mscan-clock-divider", &plen);
                 if (pval && plen == sizeof(*pval))
                         clockdiv = *pval;
@@ -251,7 +251,7 @@ static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
                                        const struct of_device_id *id)
 {
         struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct net_device *dev;
         struct mscan_priv *priv;
         void __iomem *base;
@@ -392,15 +392,17 @@ static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
 };
 
 static struct of_platform_driver mpc5xxx_can_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc5xxx_can",
+        .driver = {
+                .name = "mpc5xxx_can",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc5xxx_can_table,
+        },
         .probe = mpc5xxx_can_probe,
         .remove = __devexit_p(mpc5xxx_can_remove),
 #ifdef CONFIG_PM
         .suspend = mpc5xxx_can_suspend,
         .resume = mpc5xxx_can_resume,
 #endif
-        .match_table = mpc5xxx_can_table,
 };
 
 static int __init mpc5xxx_can_init(void)
diff --git a/drivers/net/can/mscan/mscan.h b/drivers/net/can/mscan/mscan.h
index 4ff966473bc..b43e9f5d326 100644
--- a/drivers/net/can/mscan/mscan.h
+++ b/drivers/net/can/mscan/mscan.h
@@ -227,7 +227,7 @@ struct mscan_regs {
                 u16 time;                       /* + 0x7c     0x3e */
         } tx;
         _MSCAN_RESERVED_(32, 2);                /* + 0x7e          */
-} __attribute__ ((packed));
+} __packed;
 
 #undef _MSCAN_RESERVED_
 #define MSCAN_REGION    sizeof(struct mscan)
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index 34e79efbd2f..ac1a83d7c20 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -71,7 +71,7 @@ static int __devexit sja1000_ofp_remove(struct of_device *ofdev)
 {
         struct net_device *dev = dev_get_drvdata(&ofdev->dev);
         struct sja1000_priv *priv = netdev_priv(dev);
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct resource res;
 
         dev_set_drvdata(&ofdev->dev, NULL);
@@ -90,7 +90,7 @@ static int __devexit sja1000_ofp_remove(struct of_device *ofdev)
 static int __devinit sja1000_ofp_probe(struct of_device *ofdev,
                                        const struct of_device_id *id)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct net_device *dev;
         struct sja1000_priv *priv;
         struct resource res;
@@ -215,11 +215,13 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = {
 MODULE_DEVICE_TABLE(of, sja1000_ofp_table);
 
 static struct of_platform_driver sja1000_ofp_driver = {
-        .owner = THIS_MODULE,
-        .name = DRV_NAME,
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = DRV_NAME,
+                .of_match_table = sja1000_ofp_table,
+        },
         .probe = sja1000_ofp_probe,
         .remove = __devexit_p(sja1000_ofp_remove),
-        .match_table = sja1000_ofp_table,
 };
 
 static int __init sja1000_ofp_init(void)
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 1fc0871d2ef..e75f1a87697 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -197,7 +197,7 @@ struct cpc_can_err_counter {
 };
 
 /* Main message type used between library and application */
-struct __attribute__ ((packed)) ems_cpc_msg {
+struct __packed ems_cpc_msg {
         u8 type;        /* type of message */
         u8 length;      /* length of data within union 'msg' */
         u8 msgid;       /* confirmation handle */
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index 036b2dfb1d4..092f31a126e 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -286,7 +286,6 @@ struct board_info {
         unsigned int            clock_mc3;
         unsigned int            clock_mc4;
         unsigned int            espi_nports;
-        unsigned int            clock_cspi;
         unsigned int            clock_elmer0;
         unsigned char           mdio_mdien;
         unsigned char           mdio_mdiinv;
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c
index 53bde15fc94..599d178df62 100644
--- a/drivers/net/chelsio/subr.c
+++ b/drivers/net/chelsio/subr.c
@@ -185,9 +185,6 @@ static int t1_pci_intr_handler(adapter_t *adapter)
         return 0;
 }
 
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-#include "cspi.h"
-#endif
 #ifdef CONFIG_CHELSIO_T1_1G
 #include "fpga_defs.h"
 
@@ -280,7 +277,7 @@ static void mi1_mdio_init(adapter_t *adapter, const struct board_info *bi)
         t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_CFG, val);
 }
 
-#if defined(CONFIG_CHELSIO_T1_1G) || defined(CONFIG_CHELSIO_T1_COUGAR)
+#if defined(CONFIG_CHELSIO_T1_1G)
 /*
  * Elmer MI1 MDIO read/write operations.
  */
@@ -317,7 +314,7 @@ static int mi1_mdio_write(struct net_device *dev, int phy_addr, int mmd_addr,
         return 0;
 }
 
-#if defined(CONFIG_CHELSIO_T1_1G) || defined(CONFIG_CHELSIO_T1_COUGAR)
+#if defined(CONFIG_CHELSIO_T1_1G)
 static const struct mdio_ops mi1_mdio_ops = {
         .init = mi1_mdio_init,
         .read = mi1_mdio_read,
@@ -752,31 +749,6 @@ int t1_elmer0_ext_intr_handler(adapter_t *adapter)
                                          mod_detect ? "removed" : "inserted");
                 }
                 break;
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        case CHBT_BOARD_COUGAR:
-                if (adapter->params.nports == 1) {
-                        if (cause & ELMER0_GP_BIT1) {         /* Vitesse MAC */
-                                struct cmac *mac = adapter->port[0].mac;
-                                mac->ops->interrupt_handler(mac);
-                        }
-                        if (cause & ELMER0_GP_BIT5) {     /* XPAK MOD_DETECT */
-                        }
-                } else {
-                        int i, port_bit;
-
-                        for_each_port(adapter, i) {
-                                port_bit = i ? i + 1 : 0;
-                                if (!(cause & (1 << port_bit)))
-                                        continue;
-
-                                phy = adapter->port[i].phy;
-                                phy_cause = phy->ops->interrupt_handler(phy);
-                                if (phy_cause & cphy_cause_link_change)
-                                        t1_link_changed(adapter, i);
-                        }
-                }
-                break;
-#endif
         }
         t1_tpi_write(adapter, A_ELMER0_INT_CAUSE, cause);
         return 0;
@@ -955,7 +927,6 @@ static int board_init(adapter_t *adapter, const struct board_info *bi)
         case CHBT_BOARD_N110:
         case CHBT_BOARD_N210:
         case CHBT_BOARD_CHT210:
-        case CHBT_BOARD_COUGAR:
                 t1_tpi_par(adapter, 0xf);
                 t1_tpi_write(adapter, A_ELMER0_GPO, 0x800);
                 break;
@@ -1004,10 +975,6 @@ int t1_init_hw_modules(adapter_t *adapter)
                        adapter->regs + A_MC5_CONFIG);
         }
 
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        if (adapter->cspi && t1_cspi_init(adapter->cspi))
-                goto out_err;
-#endif
         if (adapter->espi && t1_espi_init(adapter->espi, bi->chip_mac,
                                           bi->espi_nports))
                 goto out_err;
@@ -1061,10 +1028,6 @@ void t1_free_sw_modules(adapter_t *adapter)
                 t1_tp_destroy(adapter->tp);
         if (adapter->espi)
                 t1_espi_destroy(adapter->espi);
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        if (adapter->cspi)
-                t1_cspi_destroy(adapter->cspi);
-#endif
 }
 
 static void __devinit init_link_config(struct link_config *lc,
@@ -1084,14 +1047,6 @@ static void __devinit init_link_config(struct link_config *lc,
         }
 }
 
-#ifdef CONFIG_CHELSIO_T1_COUGAR
-        if (bi->clock_cspi && !(adapter->cspi = t1_cspi_create(adapter))) {
-                pr_err("%s: CSPI initialization failed\n",
-                       adapter->name);
-                goto error;
-        }
-#endif
-
 /*
  * Allocate and initialize the data structures that hold the SW state of
  * the Terminator HW modules.
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index be90d3598bc..e5539f05cbf 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -2824,7 +2824,7 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
 
         err = ip_route_output_key(&init_net, &rt, &fl);
         if (!err)
-                *dst = &rt->u.dst;
+                *dst = &rt->dst;
         return err;
 #else
         return -ENETUNREACH;
@@ -2996,7 +2996,7 @@ err_out:
 static int cnic_cm_abort(struct cnic_sock *csk)
 {
         struct cnic_local *cp = csk->dev->cnic_priv;
-        u32 opcode;
+        u32 opcode = L4_KCQE_OPCODE_VALUE_RESET_COMP;
 
         if (!cnic_in_use(csk))
                 return -EINVAL;
@@ -3008,12 +3008,9 @@ static int cnic_cm_abort(struct cnic_sock *csk)
          * connect was not successful.
          */
 
-        csk->state = L4_KCQE_OPCODE_VALUE_RESET_COMP;
-        if (test_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags))
-                opcode = csk->state;
-        else
-                opcode = L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD;
         cp->close_conn(csk, opcode);
+        if (csk->state != opcode)
+                return -EALREADY;
 
         return 0;
 }
@@ -3026,6 +3023,8 @@ static int cnic_cm_close(struct cnic_sock *csk)
         if (cnic_close_prep(csk)) {
                 csk->state = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
                 return cnic_cm_close_req(csk);
+        } else {
+                return -EALREADY;
         }
         return 0;
 }
@@ -3141,12 +3140,6 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)
                 break;
 
         case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
-                if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags)) {
-                        cnic_cm_upcall(cp, csk, opcode);
-                        break;
-                } else if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags))
-                        csk->state = opcode;
-                /* fall through */
         case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
         case L4_KCQE_OPCODE_VALUE_RESET_COMP:
         case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:
@@ -3202,19 +3195,22 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)
 
 static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode)
 {
-        if ((opcode == csk->state) ||
-            (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED &&
-             csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP)) {
-                if (!test_and_set_bit(SK_F_CLOSING, &csk->flags))
-                        return 1;
+        if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) {
+                /* Unsolicited RESET_COMP or RESET_RECEIVED */
+                opcode = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
+                csk->state = opcode;
         }
-        /* 57710+ only  workaround to handle unsolicited RESET_COMP
-         * which will be treated like a RESET RCVD notification
-         * which triggers the clean up procedure
+
+        /* 1. If event opcode matches the expected event in csk->state
+         * 2. If the expected event is CLOSE_COMP, we accept any event
+         * 3. If the expected event is 0, meaning the connection was never
+         *    never established, we accept the opcode from cm_abort.
          */
-        else if (opcode == L4_KCQE_OPCODE_VALUE_RESET_COMP) {
+        if (opcode == csk->state || csk->state == 0 ||
+            csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP) {
                 if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) {
-                        csk->state = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
+                        if (csk->state == 0)
+                                csk->state = opcode;
                         return 1;
                 }
         }
@@ -3226,8 +3222,14 @@ static void cnic_close_bnx2_conn(struct cnic_sock *csk, u32 opcode)
         struct cnic_dev *dev = csk->dev;
         struct cnic_local *cp = dev->cnic_priv;
 
+        if (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED) {
+                cnic_cm_upcall(cp, csk, opcode);
+                return;
+        }
+
         clear_bit(SK_F_CONNECT_START, &csk->flags);
         cnic_close_conn(csk);
+        csk->state = opcode;
         cnic_cm_upcall(cp, csk, opcode);
 }
 
@@ -3257,8 +3259,12 @@ static void cnic_close_bnx2x_conn(struct cnic_sock *csk, u32 opcode)
         case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
         case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
         case L4_KCQE_OPCODE_VALUE_RESET_COMP:
-                if (cnic_ready_to_close(csk, opcode))
-                        cmd = L5CM_RAMROD_CMD_ID_SEARCHER_DELETE;
+                if (cnic_ready_to_close(csk, opcode)) {
+                        if (test_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags))
+                                cmd = L5CM_RAMROD_CMD_ID_SEARCHER_DELETE;
+                        else
+                                close_complete = 1;
+                }
                 break;
         case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:
                 cmd = L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD;
@@ -3367,13 +3373,9 @@ static int cnic_cm_shutdown(struct cnic_dev *dev)
 
 static void cnic_init_context(struct cnic_dev *dev, u32 cid)
 {
-        struct cnic_local *cp = dev->cnic_priv;
         u32 cid_addr;
         int i;
 
-        if (CHIP_NUM(cp) == CHIP_NUM_5709)
-                return;
-
         cid_addr = GET_CID_ADDR(cid);
 
         for (i = 0; i < CTX_SIZE; i += 4)
@@ -3530,14 +3532,11 @@ static void cnic_init_bnx2_tx_ring(struct cnic_dev *dev)
 
         sb_id = cp->status_blk_num;
         tx_cid = 20;
-        cnic_init_context(dev, tx_cid);
-        cnic_init_context(dev, tx_cid + 1);
         cp->tx_cons_ptr = &s_blk->status_tx_quick_consumer_index2;
         if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {
                 struct status_block_msix *sblk = cp->status_blk.bnx2;
 
                 tx_cid = TX_TSS_CID + sb_id - 1;
-                cnic_init_context(dev, tx_cid);
                 CNIC_WR(dev, BNX2_TSCH_TSS_CFG, (sb_id << 24) |
                         (TX_TSS_CID << 7));
                 cp->tx_cons_ptr = &sblk->status_tx_quick_consumer_index;
@@ -3556,6 +3555,9 @@ static void cnic_init_bnx2_tx_ring(struct cnic_dev *dev)
                 offset2 = BNX2_L2CTX_TBDR_BHADDR_HI_XI;
                 offset3 = BNX2_L2CTX_TBDR_BHADDR_LO_XI;
         } else {
+                cnic_init_context(dev, tx_cid);
+                cnic_init_context(dev, tx_cid + 1);
+
                 offset0 = BNX2_L2CTX_TYPE;
                 offset1 = BNX2_L2CTX_CMD_TYPE;
                 offset2 = BNX2_L2CTX_TBDR_BHADDR_HI;
diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 110c62072e6..0c55177db04 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.1.1"
-#define CNIC_MODULE_RELDATE     "Feb 22, 2010"
+#define CNIC_MODULE_VERSION     "2.1.2"
+#define CNIC_MODULE_RELDATE     "May 26, 2010"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index e3f1b856649..066fd5b09fd 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2311,15 +2311,9 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
                 if (copy_from_user(&t, useraddr, sizeof(t)))
                         return -EFAULT;
                 /* Check t.len sanity ? */
-                fw_data = kmalloc(t.len, GFP_KERNEL);
-                if (!fw_data)
-                        return -ENOMEM;
-
-                if (copy_from_user
-                        (fw_data, useraddr + sizeof(t), t.len)) {
-                        kfree(fw_data);
-                        return -EFAULT;
-                }
+                fw_data = memdup_user(useraddr + sizeof(t), t.len);
+                if (IS_ERR(fw_data))
+                        return PTR_ERR(fw_data);
 
                 ret = t3_load_fw(adapter, fw_data, t.len);
                 kfree(fw_data);
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index abcc838e18a..4fd6b2b4554 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -961,7 +961,7 @@ struct dm9000_rxhdr {
         u8      RxPktReady;
         u8      RxStatus;
         __le16  RxLen;
-} __attribute__((__packed__));
+} __packed;
 
 /*
  *  Received a packet and pass to upper layer
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ebdea089166..68a80893dce 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1047,15 +1047,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 goto err_register;
 
         /* print bus type/speed/width info */
-        e_info("(PCI%s:%s:%s) ",
-                ((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""),
-                ((hw->bus_speed == e1000_bus_speed_133) ? "133MHz" :
-                 (hw->bus_speed == e1000_bus_speed_120) ? "120MHz" :
-                 (hw->bus_speed == e1000_bus_speed_100) ? "100MHz" :
-                 (hw->bus_speed == e1000_bus_speed_66) ? "66MHz" : "33MHz"),
-                ((hw->bus_width == e1000_bus_width_64) ? "64-bit" : "32-bit"));
-
-        e_info("%pM\n", netdev->dev_addr);
+        e_info("(PCI%s:%dMHz:%d-bit) %pM\n",
+               ((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""),
+               ((hw->bus_speed == e1000_bus_speed_133) ? 133 :
+                (hw->bus_speed == e1000_bus_speed_120) ? 120 :
+                (hw->bus_speed == e1000_bus_speed_100) ? 100 :
+                (hw->bus_speed == e1000_bus_speed_66) ? 66 : 33),
+               ((hw->bus_width == e1000_bus_width_64) ? 64 : 32),
+               netdev->dev_addr);
 
         /* carrier off reporting is important to ethtool even BEFORE open */
         netif_carrier_off(netdev);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 24507f3b8b1..57a7e41da69 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2554,7 +2554,7 @@ static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
                         mdef = er32(MDEF(i));
 
                         /* Ignore filters with anything other than IPMI ports */
-                        if (mdef & !(E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
+                        if (mdef & ~(E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
                                 continue;
 
                         /* Enable this decision filter in MANC2H */
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 02698a1c80b..f547894ff48 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -122,8 +122,11 @@ static struct of_device_id ehea_device_table[] = {
 MODULE_DEVICE_TABLE(of, ehea_device_table);
 
 static struct of_platform_driver ehea_driver = {
-        .name = "ehea",
-        .match_table = ehea_device_table,
+        .driver = {
+                .name = "ehea",
+                .owner = THIS_MODULE,
+                .of_match_table = ehea_device_table,
+        },
         .probe = ehea_probe_adapter,
         .remove = ehea_remove,
 };
@@ -3050,7 +3053,7 @@ static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id,
 static void __devinit logical_port_release(struct device *dev)
 {
         struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
-        of_node_put(port->ofdev.node);
+        of_node_put(port->ofdev.dev.of_node);
 }
 
 static struct device *ehea_register_port(struct ehea_port *port,
@@ -3058,7 +3061,7 @@ static struct device *ehea_register_port(struct ehea_port *port,
 {
         int ret;
 
-        port->ofdev.node = of_node_get(dn);
+        port->ofdev.dev.of_node = of_node_get(dn);
         port->ofdev.dev.parent = &port->adapter->ofdev->dev;
         port->ofdev.dev.bus = &ibmebus_bus_type;
 
@@ -3225,7 +3228,7 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
         const u32 *dn_log_port_id;
         int i = 0;
 
-        lhea_dn = adapter->ofdev->node;
+        lhea_dn = adapter->ofdev->dev.of_node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
                 dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
@@ -3264,7 +3267,7 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
         struct device_node *eth_dn = NULL;
         const u32 *dn_log_port_id;
 
-        lhea_dn = adapter->ofdev->node;
+        lhea_dn = adapter->ofdev->dev.of_node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
                 dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
@@ -3394,7 +3397,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
         const u64 *adapter_handle;
         int ret;
 
-        if (!dev || !dev->node) {
+        if (!dev || !dev->dev.of_node) {
                 ehea_error("Invalid ibmebus device probed");
                 return -EINVAL;
         }
@@ -3410,14 +3413,14 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
 
         adapter->ofdev = dev;
 
-        adapter_handle = of_get_property(dev->node, "ibm,hea-handle",
+        adapter_handle = of_get_property(dev->dev.of_node, "ibm,hea-handle",
                                          NULL);
         if (adapter_handle)
                 adapter->handle = *adapter_handle;
 
         if (!adapter->handle) {
                 dev_err(&dev->dev, "failed getting handle for adapter"
-                        " '%s'\n", dev->node->full_name);
+                        " '%s'\n", dev->dev.of_node->full_name);
                 ret = -ENODEV;
                 goto out_free_ad;
         }
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 882c50c9c34..f608a6c54af 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -126,7 +126,7 @@ struct ehea_swqe {
                         u8 immediate_data[SWQE2_MAX_IMM];
                         /* 0xd0 */
                         struct ehea_vsgentry sg_list[EHEA_MAX_WQE_SG_ENTRIES-1];
-                } immdata_desc __attribute__ ((packed));
+                } immdata_desc __packed;
 
                 /*  Send WQE Format 3 */
                 struct {
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 85f2a2e7030..45e86d1e5b1 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -74,7 +74,14 @@ struct enic_msix_entry {
         void *devid;
 };
 
+#define ENIC_SET_APPLIED                (1 << 0)
+#define ENIC_SET_REQUEST                (1 << 1)
+#define ENIC_SET_NAME                   (1 << 2)
+#define ENIC_SET_INSTANCE               (1 << 3)
+#define ENIC_SET_HOST                   (1 << 4)
+
 struct enic_port_profile {
+        u32 set;
         u8 request;
         char name[PORT_PROFILE_MAX];
         u8 instance_uuid[PORT_UUID_MAX];
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index e125113759a..bc7d6b96de3 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1029,127 +1029,133 @@ static int enic_dev_init_done(struct enic *enic, int *done, int *error)
         return err;
 }
 
-static int enic_set_port_profile(struct enic *enic, u8 request, u8 *mac,
-        char *name, u8 *instance_uuid, u8 *host_uuid)
+static int enic_set_port_profile(struct enic *enic, u8 *mac)
 {
         struct vic_provinfo *vp;
         u8 oui[3] = VIC_PROVINFO_CISCO_OUI;
-        unsigned short *uuid;
+        u8 *uuid;
         char uuid_str[38];
-        static char *uuid_fmt = "%04X%04X-%04X-%04X-%04X-%04X%04X%04X";
+        static char *uuid_fmt = "%02X%02X%02X%02X-%02X%02X-%02X%02X-"
+                "%02X%02X-%02X%02X%02X%02X%0X%02X";
         int err;
 
-        if (!name)
-                return -EINVAL;
+        err = enic_vnic_dev_deinit(enic);
+        if (err)
+                return err;
 
-        if (!is_valid_ether_addr(mac))
-                return -EADDRNOTAVAIL;
+        switch (enic->pp.request) {
 
-        vp = vic_provinfo_alloc(GFP_KERNEL, oui, VIC_PROVINFO_LINUX_TYPE);
-        if (!vp)
-                return -ENOMEM;
+        case PORT_REQUEST_ASSOCIATE:
 
-        vic_provinfo_add_tlv(vp,
-                VIC_LINUX_PROV_TLV_PORT_PROFILE_NAME_STR,
-                strlen(name) + 1, name);
+                if (!(enic->pp.set & ENIC_SET_NAME) || !strlen(enic->pp.name))
+                        return -EINVAL;
 
-        vic_provinfo_add_tlv(vp,
-                VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR,
-                ETH_ALEN, mac);
+                if (!is_valid_ether_addr(mac))
+                        return -EADDRNOTAVAIL;
 
-        if (instance_uuid) {
-                uuid = (unsigned short *)instance_uuid;
-                sprintf(uuid_str, uuid_fmt,
-                        uuid[0], uuid[1], uuid[2], uuid[3],
-                        uuid[4], uuid[5], uuid[6], uuid[7]);
-                vic_provinfo_add_tlv(vp,
-                        VIC_LINUX_PROV_TLV_CLIENT_UUID_STR,
-                        sizeof(uuid_str), uuid_str);
-        }
+                vp = vic_provinfo_alloc(GFP_KERNEL, oui,
+                        VIC_PROVINFO_LINUX_TYPE);
+                if (!vp)
+                        return -ENOMEM;
 
-        if (host_uuid) {
-                uuid = (unsigned short *)host_uuid;
-                sprintf(uuid_str, uuid_fmt,
-                        uuid[0], uuid[1], uuid[2], uuid[3],
-                        uuid[4], uuid[5], uuid[6], uuid[7]);
                 vic_provinfo_add_tlv(vp,
-                        VIC_LINUX_PROV_TLV_HOST_UUID_STR,
-                        sizeof(uuid_str), uuid_str);
-        }
+                        VIC_LINUX_PROV_TLV_PORT_PROFILE_NAME_STR,
+                        strlen(enic->pp.name) + 1, enic->pp.name);
 
-        err = enic_vnic_dev_deinit(enic);
-        if (err)
-                goto err_out;
-
-        memset(&enic->pp, 0, sizeof(enic->pp));
+                vic_provinfo_add_tlv(vp,
+                        VIC_LINUX_PROV_TLV_CLIENT_MAC_ADDR,
+                        ETH_ALEN, mac);
+
+                if (enic->pp.set & ENIC_SET_INSTANCE) {
+                        uuid = enic->pp.instance_uuid;
+                        sprintf(uuid_str, uuid_fmt,
+                                uuid[0],  uuid[1],  uuid[2],  uuid[3],
+                                uuid[4],  uuid[5],  uuid[6],  uuid[7],
+                                uuid[8],  uuid[9],  uuid[10], uuid[11],
+                                uuid[12], uuid[13], uuid[14], uuid[15]);
+                        vic_provinfo_add_tlv(vp,
+                                VIC_LINUX_PROV_TLV_CLIENT_UUID_STR,
+                                sizeof(uuid_str), uuid_str);
+                }
 
-        err = enic_dev_init_prov(enic, vp);
-        if (err)
-                goto err_out;
+                if (enic->pp.set & ENIC_SET_HOST) {
+                        uuid = enic->pp.host_uuid;
+                        sprintf(uuid_str, uuid_fmt,
+                                uuid[0],  uuid[1],  uuid[2],  uuid[3],
+                                uuid[4],  uuid[5],  uuid[6],  uuid[7],
+                                uuid[8],  uuid[9],  uuid[10], uuid[11],
+                                uuid[12], uuid[13], uuid[14], uuid[15]);
+                        vic_provinfo_add_tlv(vp,
+                                VIC_LINUX_PROV_TLV_HOST_UUID_STR,
+                                sizeof(uuid_str), uuid_str);
+                }
 
-        enic->pp.request = request;
-        memcpy(enic->pp.name, name, PORT_PROFILE_MAX);
-        if (instance_uuid)
-                memcpy(enic->pp.instance_uuid,
-                        instance_uuid, PORT_UUID_MAX);
-        if (host_uuid)
-                memcpy(enic->pp.host_uuid,
-                        host_uuid, PORT_UUID_MAX);
+                err = enic_dev_init_prov(enic, vp);
+                vic_provinfo_free(vp);
+                if (err)
+                        return err;
+                break;
 
-err_out:
-        vic_provinfo_free(vp);
+        case PORT_REQUEST_DISASSOCIATE:
+                break;
 
-        return err;
-}
+        default:
+                return -EINVAL;
+        }
 
-static int enic_unset_port_profile(struct enic *enic)
-{
-        memset(&enic->pp, 0, sizeof(enic->pp));
-        return enic_vnic_dev_deinit(enic);
+        enic->pp.set |= ENIC_SET_APPLIED;
+        return 0;
 }
 
 static int enic_set_vf_port(struct net_device *netdev, int vf,
         struct nlattr *port[])
 {
         struct enic *enic = netdev_priv(netdev);
-        char *name = NULL;
-        u8 *instance_uuid = NULL;
-        u8 *host_uuid = NULL;
-        u8 request = PORT_REQUEST_DISASSOCIATE;
 
-        /* don't support VFs, yet */
-        if (vf != PORT_SELF_VF)
-                return -EOPNOTSUPP;
+        memset(&enic->pp, 0, sizeof(enic->pp));
 
-        if (port[IFLA_PORT_REQUEST])
-                request = nla_get_u8(port[IFLA_PORT_REQUEST]);
+        if (port[IFLA_PORT_REQUEST]) {
+                enic->pp.set |= ENIC_SET_REQUEST;
+                enic->pp.request = nla_get_u8(port[IFLA_PORT_REQUEST]);
+        }
 
-        switch (request) {
-        case PORT_REQUEST_ASSOCIATE:
+        if (port[IFLA_PORT_PROFILE]) {
+                enic->pp.set |= ENIC_SET_NAME;
+                memcpy(enic->pp.name, nla_data(port[IFLA_PORT_PROFILE]),
+                        PORT_PROFILE_MAX);
+        }
 
-                if (port[IFLA_PORT_PROFILE])
-                        name = nla_data(port[IFLA_PORT_PROFILE]);
+        if (port[IFLA_PORT_INSTANCE_UUID]) {
+                enic->pp.set |= ENIC_SET_INSTANCE;
+                memcpy(enic->pp.instance_uuid,
+                        nla_data(port[IFLA_PORT_INSTANCE_UUID]), PORT_UUID_MAX);
+        }
 
-                if (port[IFLA_PORT_INSTANCE_UUID])
-                        instance_uuid =
-                                nla_data(port[IFLA_PORT_INSTANCE_UUID]);
+        if (port[IFLA_PORT_HOST_UUID]) {
+                enic->pp.set |= ENIC_SET_HOST;
+                memcpy(enic->pp.host_uuid,
+                        nla_data(port[IFLA_PORT_HOST_UUID]), PORT_UUID_MAX);
+        }
 
-                if (port[IFLA_PORT_HOST_UUID])
-                        host_uuid = nla_data(port[IFLA_PORT_HOST_UUID]);
+        /* don't support VFs, yet */
+        if (vf != PORT_SELF_VF)
+                return -EOPNOTSUPP;
 
-                return enic_set_port_profile(enic, request,
-                        netdev->dev_addr, name,
-                        instance_uuid, host_uuid);
+        if (!(enic->pp.set & ENIC_SET_REQUEST))
+                return -EOPNOTSUPP;
 
-        case PORT_REQUEST_DISASSOCIATE:
+        if (enic->pp.request == PORT_REQUEST_ASSOCIATE) {
 
-                return enic_unset_port_profile(enic);
+                /* If the interface mac addr hasn't been assigned,
+                 * assign a random mac addr before setting port-
+                 * profile.
+                 */
 
-        default:
-                break;
+                if (is_zero_ether_addr(netdev->dev_addr))
+                        random_ether_addr(netdev->dev_addr);
         }
 
-        return -EOPNOTSUPP;
+        return enic_set_port_profile(enic, netdev->dev_addr);
 }
 
 static int enic_get_vf_port(struct net_device *netdev, int vf,
@@ -1159,14 +1165,12 @@ static int enic_get_vf_port(struct net_device *netdev, int vf,
         int err, error, done;
         u16 response = PORT_PROFILE_RESPONSE_SUCCESS;
 
-        /* don't support VFs, yet */
-        if (vf != PORT_SELF_VF)
-                return -EOPNOTSUPP;
+        if (!(enic->pp.set & ENIC_SET_APPLIED))
+                return -ENODATA;
 
         err = enic_dev_init_done(enic, &done, &error);
-
         if (err)
-                return err;
+                error = err;
 
         switch (error) {
         case ERR_SUCCESS:
@@ -1189,12 +1193,15 @@ static int enic_get_vf_port(struct net_device *netdev, int vf,
 
         NLA_PUT_U16(skb, IFLA_PORT_REQUEST, enic->pp.request);
         NLA_PUT_U16(skb, IFLA_PORT_RESPONSE, response);
-        NLA_PUT(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX,
-                enic->pp.name);
-        NLA_PUT(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,
-                enic->pp.instance_uuid);
-        NLA_PUT(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX,
-                enic->pp.host_uuid);
+        if (enic->pp.set & ENIC_SET_NAME)
+                NLA_PUT(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX,
+                        enic->pp.name);
+        if (enic->pp.set & ENIC_SET_INSTANCE)
+                NLA_PUT(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,
+                        enic->pp.instance_uuid);
+        if (enic->pp.set & ENIC_SET_HOST)
+                NLA_PUT(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX,
+                        enic->pp.host_uuid);
 
         return 0;
 
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index 2b3e16db5c8..e0d33281ec9 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -709,7 +709,7 @@ int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len)
 {
         u64 a0, a1 = len;
         int wait = 1000;
-        u64 prov_pa;
+        dma_addr_t prov_pa;
         void *prov_buf;
         int ret;
 
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c
index d769772998c..0a35085004d 100644
--- a/drivers/net/enic/vnic_vic.c
+++ b/drivers/net/enic/vnic_vic.c
@@ -25,9 +25,10 @@
 
 struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, u8 *oui, u8 type)
 {
-        struct vic_provinfo *vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+        struct vic_provinfo *vp;
 
-        if (!vp || !oui)
+        vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+        if (!vp)
                 return NULL;
 
         memcpy(vp->oui, oui, sizeof(vp->oui));
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/enic/vnic_vic.h
index 085c2a274cb..7e46e5e8600 100644
--- a/drivers/net/enic/vnic_vic.h
+++ b/drivers/net/enic/vnic_vic.h
@@ -44,7 +44,7 @@ struct vic_provinfo {
                 u16 length;
                 u8 value[0];
         } tlv[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define VIC_PROVINFO_MAX_DATA           1385
 #define VIC_PROVINFO_MAX_TLV_DATA (VIC_PROVINFO_MAX_DATA - \
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 6838dfc9ef2..4c274657283 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -87,6 +87,7 @@ static int rx_copybreak;
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <asm/byteorder.h>
 
 /* These identify the driver base version and may not be removed. */
 static char version[] __devinitdata =
@@ -230,7 +231,7 @@ static const u16 media2miictl[16] = {
  * The EPIC100 Rx and Tx buffer descriptors.  Note that these
  * really ARE host-endian; it's not a misannotation.  We tell
  * the card to byteswap them internally on big-endian hosts -
- * look for #ifdef CONFIG_BIG_ENDIAN in epic_open().
+ * look for #ifdef __BIG_ENDIAN in epic_open().
  */
 
 struct epic_tx_desc {
@@ -690,7 +691,7 @@ static int epic_open(struct net_device *dev)
                 outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
 
         /* Tell the chip to byteswap descriptors on big-endian hosts */
-#ifdef CONFIG_BIG_ENDIAN
+#ifdef __BIG_ENDIAN
         outl(0x4432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
         inl(ioaddr + GENCTL);
         outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
@@ -806,7 +807,7 @@ static void epic_restart(struct net_device *dev)
         for (i = 16; i > 0; i--)
                 outl(0x0008, ioaddr + TEST1);
 
-#ifdef CONFIG_BIG_ENDIAN
+#ifdef __BIG_ENDIAN
         outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
 #else
         outl(0x0412 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 14cbde5cf68..37ce8aca2cc 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -174,11 +174,13 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");
  * @iobase:     pointer to I/O memory region
  * @membase:    pointer to buffer memory region
  * @dma_alloc:  dma allocated buffer size
+ * @io_region_size:     I/O memory region size
  * @num_tx:     number of send buffers
  * @cur_tx:     last send buffer written
  * @dty_tx:     last buffer actually sent
  * @num_rx:     number of receive buffers
  * @cur_rx:     current receive buffer
+ * @vma:        pointer to array of virtual memory addresses for buffers
  * @netdev:     pointer to network device structure
  * @napi:       NAPI structure
  * @stats:      network device statistics
@@ -193,6 +195,7 @@ struct ethoc {
         void __iomem *iobase;
         void __iomem *membase;
         int dma_alloc;
+        resource_size_t io_region_size;
 
         unsigned int num_tx;
         unsigned int cur_tx;
@@ -201,6 +204,8 @@ struct ethoc {
         unsigned int num_rx;
         unsigned int cur_rx;
 
+        void** vma;
+
         struct net_device *netdev;
         struct napi_struct napi;
         struct net_device_stats stats;
@@ -283,18 +288,22 @@ static inline void ethoc_disable_rx_and_tx(struct ethoc *dev)
         ethoc_write(dev, MODER, mode);
 }
 
-static int ethoc_init_ring(struct ethoc *dev)
+static int ethoc_init_ring(struct ethoc *dev, void* mem_start)
 {
         struct ethoc_bd bd;
         int i;
+        void* vma;
 
         dev->cur_tx = 0;
         dev->dty_tx = 0;
         dev->cur_rx = 0;
 
+        ethoc_write(dev, TX_BD_NUM, dev->num_tx);
+
         /* setup transmission buffers */
-        bd.addr = virt_to_phys(dev->membase);
+        bd.addr = mem_start;
         bd.stat = TX_BD_IRQ | TX_BD_CRC;
+        vma = dev->membase;
 
         for (i = 0; i < dev->num_tx; i++) {
                 if (i == dev->num_tx - 1)
@@ -302,6 +311,9 @@ static int ethoc_init_ring(struct ethoc *dev)
 
                 ethoc_write_bd(dev, i, &bd);
                 bd.addr += ETHOC_BUFSIZ;
+
+                dev->vma[i] = vma;
+                vma += ETHOC_BUFSIZ;
         }
 
         bd.stat = RX_BD_EMPTY | RX_BD_IRQ;
@@ -312,6 +324,9 @@ static int ethoc_init_ring(struct ethoc *dev)
 
                 ethoc_write_bd(dev, dev->num_tx + i, &bd);
                 bd.addr += ETHOC_BUFSIZ;
+
+                dev->vma[dev->num_tx + i] = vma;
+                vma += ETHOC_BUFSIZ;
         }
 
         return 0;
@@ -413,7 +428,7 @@ static int ethoc_rx(struct net_device *dev, int limit)
                         skb = netdev_alloc_skb_ip_align(dev, size);
 
                         if (likely(skb)) {
-                                void *src = phys_to_virt(bd.addr);
+                                void *src = priv->vma[entry];
                                 memcpy_fromio(skb_put(skb, size), src, size);
                                 skb->protocol = eth_type_trans(skb, dev);
                                 priv->stats.rx_packets++;
@@ -598,8 +613,11 @@ static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
 
         while (time_before(jiffies, timeout)) {
                 u32 stat = ethoc_read(priv, MIISTATUS);
-                if (!(stat & MIISTATUS_BUSY))
+                if (!(stat & MIISTATUS_BUSY)) {
+                        /* reset MII command register */
+                        ethoc_write(priv, MIICOMMAND, 0);
                         return 0;
+                }
 
                 schedule();
         }
@@ -620,21 +638,12 @@ static int ethoc_mdio_probe(struct net_device *dev)
 {
         struct ethoc *priv = netdev_priv(dev);
         struct phy_device *phy;
-        int i;
+        int err;
 
-        for (i = 0; i < PHY_MAX_ADDR; i++) {
-                phy = priv->mdio->phy_map[i];
-                if (phy) {
-                        if (priv->phy_id != -1) {
-                                /* attach to specified PHY */
-                                if (priv->phy_id == phy->addr)
-                                        break;
-                        } else {
-                                /* autoselect PHY if none was specified */
-                                if (phy->addr != 0)
-                                        break;
-                        }
-                }
+        if (priv->phy_id != -1) {
+                phy = priv->mdio->phy_map[priv->phy_id];
+        } else {
+                phy = phy_find_first(priv->mdio);
         }
 
         if (!phy) {
@@ -642,11 +651,11 @@ static int ethoc_mdio_probe(struct net_device *dev)
                 return -ENXIO;
         }
 
-        phy = phy_connect(dev, dev_name(&phy->dev), ethoc_mdio_poll, 0,
+        err = phy_connect_direct(dev, phy, ethoc_mdio_poll, 0,
                         PHY_INTERFACE_MODE_GMII);
-        if (IS_ERR(phy)) {
+        if (err) {
                 dev_err(&dev->dev, "could not attach to PHY\n");
-                return PTR_ERR(phy);
+                return err;
         }
 
         priv->phy = phy;
@@ -656,8 +665,6 @@ static int ethoc_mdio_probe(struct net_device *dev)
 static int ethoc_open(struct net_device *dev)
 {
         struct ethoc *priv = netdev_priv(dev);
-        unsigned int min_tx = 2;
-        unsigned int num_bd;
         int ret;
 
         ret = request_irq(dev->irq, ethoc_interrupt, IRQF_SHARED,
@@ -665,14 +672,7 @@ static int ethoc_open(struct net_device *dev)
         if (ret)
                 return ret;
 
-        /* calculate the number of TX/RX buffers, maximum 128 supported */
-        num_bd = min_t(unsigned int,
-                128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
-        priv->num_tx = max(min_tx, num_bd / 4);
-        priv->num_rx = num_bd - priv->num_tx;
-        ethoc_write(priv, TX_BD_NUM, priv->num_tx);
-
-        ethoc_init_ring(priv);
+        ethoc_init_ring(priv, (void*)dev->mem_start);
         ethoc_reset(priv);
 
         if (netif_queue_stopped(dev)) {
@@ -836,7 +836,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
         else
                 bd.stat &= ~TX_BD_PAD;
 
-        dest = phys_to_virt(bd.addr);
+        dest = priv->vma[entry];
         memcpy_toio(dest, skb->data, skb->len);
 
         bd.stat &= ~(TX_BD_STATS | TX_BD_LEN_MASK);
@@ -882,6 +882,7 @@ static int ethoc_probe(struct platform_device *pdev)
         struct resource *mem = NULL;
         struct ethoc *priv = NULL;
         unsigned int phy;
+        int num_bd;
         int ret = 0;
 
         /* allocate networking device */
@@ -943,6 +944,7 @@ static int ethoc_probe(struct platform_device *pdev)
         priv = netdev_priv(netdev);
         priv->netdev = netdev;
         priv->dma_alloc = 0;
+        priv->io_region_size = mmio->end - mmio->start + 1;
 
         priv->iobase = devm_ioremap_nocache(&pdev->dev, netdev->base_addr,
                         resource_size(mmio));
@@ -962,7 +964,7 @@ static int ethoc_probe(struct platform_device *pdev)
                 }
         } else {
                 /* Allocate buffer memory */
-                priv->membase = dma_alloc_coherent(NULL,
+                priv->membase = dmam_alloc_coherent(&pdev->dev,
                         buffer_size, (void *)&netdev->mem_start,
                         GFP_KERNEL);
                 if (!priv->membase) {
@@ -975,6 +977,18 @@ static int ethoc_probe(struct platform_device *pdev)
                 priv->dma_alloc = buffer_size;
         }
 
+        /* calculate the number of TX/RX buffers, maximum 128 supported */
+        num_bd = min_t(unsigned int,
+                128, (netdev->mem_end - netdev->mem_start + 1) / ETHOC_BUFSIZ);
+        priv->num_tx = max(2, num_bd / 4);
+        priv->num_rx = num_bd - priv->num_tx;
+
+        priv->vma = devm_kzalloc(&pdev->dev, num_bd*sizeof(void*), GFP_KERNEL);
+        if (!priv->vma) {
+                ret = -ENOMEM;
+                goto error;
+        }
+
         /* Allow the platform setup code to pass in a MAC address. */
         if (pdev->dev.platform_data) {
                 struct ethoc_platform_data *pdata =
@@ -1047,20 +1061,19 @@ static int ethoc_probe(struct platform_device *pdev)
         ret = register_netdev(netdev);
         if (ret < 0) {
                 dev_err(&netdev->dev, "failed to register interface\n");
-                goto error;
+                goto error2;
         }
 
         goto out;
 
+error2:
+        netif_napi_del(&priv->napi);
 error:
         mdiobus_unregister(priv->mdio);
 free_mdio:
         kfree(priv->mdio->irq);
         mdiobus_free(priv->mdio);
 free:
-        if (priv->dma_alloc)
-                dma_free_coherent(NULL, priv->dma_alloc, priv->membase,
-                        netdev->mem_start);
         free_netdev(netdev);
 out:
         return ret;
@@ -1078,6 +1091,7 @@ static int ethoc_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
 
         if (netdev) {
+                netif_napi_del(&priv->napi);
                 phy_disconnect(priv->phy);
                 priv->phy = NULL;
 
@@ -1086,9 +1100,6 @@ static int ethoc_remove(struct platform_device *pdev)
                         kfree(priv->mdio->irq);
                         mdiobus_free(priv->mdio);
                 }
-                if (priv->dma_alloc)
-                        dma_free_coherent(NULL, priv->dma_alloc, priv->membase,
-                                netdev->mem_start);
                 unregister_netdev(netdev);
                 free_netdev(netdev);
         }
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 42d9ac9ba39..a3cae4ed6ac 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -41,6 +41,7 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
+#include <linux/fec.h>
 
 #include <asm/cacheflush.h>
 
@@ -182,6 +183,7 @@ struct fec_enet_private {
         struct  phy_device *phy_dev;
         int     mii_timeout;
         uint    phy_speed;
+        phy_interface_t phy_interface;
         int     index;
         int     link;
         int     full_duplex;
@@ -208,7 +210,7 @@ static void fec_stop(struct net_device *dev);
 /* Transmitter timeout */
 #define TX_TIMEOUT (2 * HZ)
 
-static int
+static netdev_tx_t
 fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct fec_enet_private *fep = netdev_priv(dev);
@@ -677,28 +679,24 @@ static int fec_enet_mii_probe(struct net_device *dev)
 {
         struct fec_enet_private *fep = netdev_priv(dev);
         struct phy_device *phy_dev = NULL;
-        int phy_addr;
+        int ret;
 
-        /* find the first phy */
-        for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
-                if (fep->mii_bus->phy_map[phy_addr]) {
-                        phy_dev = fep->mii_bus->phy_map[phy_addr];
-                        break;
-                }
-        }
+        fep->phy_dev = NULL;
 
+        /* find the first phy */
+        phy_dev = phy_find_first(fep->mii_bus);
         if (!phy_dev) {
                 printk(KERN_ERR "%s: no PHY found\n", dev->name);
                 return -ENODEV;
         }
 
         /* attach the mac to the phy */
-        phy_dev = phy_connect(dev, dev_name(&phy_dev->dev),
+        ret = phy_connect_direct(dev, phy_dev,
                              &fec_enet_adjust_link, 0,
                              PHY_INTERFACE_MODE_MII);
-        if (IS_ERR(phy_dev)) {
+        if (ret) {
                 printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
-                return PTR_ERR(phy_dev);
+                return ret;
         }
 
         /* mask with MAC supported features */
@@ -709,6 +707,11 @@ static int fec_enet_mii_probe(struct net_device *dev)
         fep->link = 0;
         fep->full_duplex = 0;
 
+        printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] "
+                "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
+                fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
+                fep->phy_dev->irq);
+
         return 0;
 }
 
@@ -754,13 +757,8 @@ static int fec_enet_mii_init(struct platform_device *pdev)
         if (mdiobus_register(fep->mii_bus))
                 goto err_out_free_mdio_irq;
 
-        if (fec_enet_mii_probe(dev) != 0)
-                goto err_out_unregister_bus;
-
         return 0;
 
-err_out_unregister_bus:
-        mdiobus_unregister(fep->mii_bus);
 err_out_free_mdio_irq:
         kfree(fep->mii_bus->irq);
 err_out_free_mdiobus:
@@ -913,7 +911,12 @@ fec_enet_open(struct net_device *dev)
         if (ret)
                 return ret;
 
-        /* schedule a link state check */
+        /* Probe and connect to PHY when open the interface */
+        ret = fec_enet_mii_probe(dev);
+        if (ret) {
+                fec_enet_free_buffers(dev);
+                return ret;
+        }
         phy_start(fep->phy_dev);
         netif_start_queue(dev);
         fep->opened = 1;
@@ -927,10 +930,12 @@ fec_enet_close(struct net_device *dev)
 
         /* Don't know what to do yet. */
         fep->opened = 0;
-        phy_stop(fep->phy_dev);
         netif_stop_queue(dev);
         fec_stop(dev);
 
+        if (fep->phy_dev)
+                phy_disconnect(fep->phy_dev);
+
         fec_enet_free_buffers(dev);
 
         return 0;
@@ -1191,6 +1196,21 @@ fec_restart(struct net_device *dev, int duplex)
         /* Set MII speed */
         writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
 
+#ifdef FEC_MIIGSK_ENR
+        if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
+                /* disable the gasket and wait */
+                writel(0, fep->hwp + FEC_MIIGSK_ENR);
+                while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
+                        udelay(1);
+
+                /* configure the gasket: RMII, 50 MHz, no loopback, no echo */
+                writel(1, fep->hwp + FEC_MIIGSK_CFGR);
+
+                /* re-enable the gasket */
+                writel(2, fep->hwp + FEC_MIIGSK_ENR);
+        }
+#endif
+
         /* And last, enable the transmit and receive processing */
         writel(2, fep->hwp + FEC_ECNTRL);
         writel(0, fep->hwp + FEC_R_DES_ACTIVE);
@@ -1226,6 +1246,7 @@ static int __devinit
 fec_probe(struct platform_device *pdev)
 {
         struct fec_enet_private *fep;
+        struct fec_platform_data *pdata;
         struct net_device *ndev;
         int i, irq, ret = 0;
         struct resource *r;
@@ -1259,6 +1280,10 @@ fec_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ndev);
 
+        pdata = pdev->dev.platform_data;
+        if (pdata)
+                fep->phy_interface = pdata->phy;
+
         /* This device has up to three irqs on some platforms */
         for (i = 0; i < 3; i++) {
                 irq = platform_get_irq(pdev, i);
@@ -1294,11 +1319,6 @@ fec_probe(struct platform_device *pdev)
         if (ret)
                 goto failed_register;
 
-        printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] "
-                "(mii_bus:phy_addr=%s, irq=%d)\n", ndev->name,
-                fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
-                fep->phy_dev->irq);
-
         return 0;
 
 failed_register:
@@ -1339,6 +1359,8 @@ fec_drv_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+
 static int
 fec_suspend(struct platform_device *dev, pm_message_t state)
 {
@@ -1347,10 +1369,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;
 }
@@ -1359,25 +1380,42 @@ 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;
 }
 
+static const struct dev_pm_ops fec_pm_ops = {
+        .suspend        = fec_suspend,
+        .resume         = fec_resume,
+        .freeze         = fec_suspend,
+        .thaw           = fec_resume,
+        .poweroff       = fec_suspend,
+        .restore        = fec_resume,
+};
+
+#define FEC_PM_OPS (&fec_pm_ops)
+
+#else /* !CONFIG_PM */
+
+#define FEC_PM_OPS NULL
+
+#endif /* !CONFIG_PM */
+
 static struct platform_driver fec_driver = {
         .driver = {
                 .name    = "fec",
                 .owner   = THIS_MODULE,
+                .pm              = FEC_PM_OPS,
         },
         .probe   = fec_probe,
         .remove  = __devexit_p(fec_drv_remove),
-        .suspend = fec_suspend,
-        .resume  = fec_resume,
 };
 
 static int __init
diff --git a/drivers/net/fec.h b/drivers/net/fec.h
index cc47f3f057c..2c48b25668d 100644
--- a/drivers/net/fec.h
+++ b/drivers/net/fec.h
@@ -43,6 +43,8 @@
 #define FEC_R_DES_START         0x180 /* Receive descriptor ring */
 #define FEC_X_DES_START         0x184 /* Transmit descriptor ring */
 #define FEC_R_BUFF_SIZE         0x188 /* Maximum receive buff size */
+#define FEC_MIIGSK_CFGR         0x300 /* MIIGSK Configuration reg */
+#define FEC_MIIGSK_ENR          0x308 /* MIIGSK Enable reg */
 
 #else
 
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 221f440c10f..25e6cc6840b 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -871,7 +871,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
         priv->ndev = ndev;
 
         /* Reserve FEC control zone */
-        rv = of_address_to_resource(op->node, 0, &mem);
+        rv = of_address_to_resource(op->dev.of_node, 0, &mem);
         if (rv) {
                 printk(KERN_ERR DRIVER_NAME ": "
                                 "Error while parsing device node resource\n" );
@@ -919,7 +919,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
 
         /* Get the IRQ we need one by one */
                 /* Control */
-        ndev->irq = irq_of_parse_and_map(op->node, 0);
+        ndev->irq = irq_of_parse_and_map(op->dev.of_node, 0);
 
                 /* RX */
         priv->r_irq = bcom_get_task_irq(priv->rx_dmatsk);
@@ -942,20 +942,20 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
         /* Start with safe defaults for link connection */
         priv->speed = 100;
         priv->duplex = DUPLEX_HALF;
-        priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1;
+        priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->dev.of_node) >> 20) / 5) << 1;
 
         /* The current speed preconfigures the speed of the MII link */
-        prop = of_get_property(op->node, "current-speed", &prop_size);
+        prop = of_get_property(op->dev.of_node, "current-speed", &prop_size);
         if (prop && (prop_size >= sizeof(u32) * 2)) {
                 priv->speed = prop[0];
                 priv->duplex = prop[1] ? DUPLEX_FULL : DUPLEX_HALF;
         }
 
         /* If there is a phy handle, then get the PHY node */
-        priv->phy_node = of_parse_phandle(op->node, "phy-handle", 0);
+        priv->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
 
         /* the 7-wire property means don't use MII mode */
-        if (of_find_property(op->node, "fsl,7-wire-mode", NULL)) {
+        if (of_find_property(op->dev.of_node, "fsl,7-wire-mode", NULL)) {
                 priv->seven_wire_mode = 1;
                 dev_info(&ndev->dev, "using 7-wire PHY mode\n");
         }
@@ -1063,9 +1063,11 @@ static struct of_device_id mpc52xx_fec_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
 
 static struct of_platform_driver mpc52xx_fec_driver = {
-        .owner          = THIS_MODULE,
-        .name           = DRIVER_NAME,
-        .match_table    = mpc52xx_fec_match,
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_fec_match,
+        },
         .probe          = mpc52xx_fec_probe,
         .remove         = mpc52xx_fec_remove,
 #ifdef CONFIG_PM
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 7658a082e39..dbaf72cbb23 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -29,15 +29,14 @@ static int mpc52xx_fec_mdio_transfer(struct mii_bus *bus, int phy_id,
                 int reg, u32 value)
 {
         struct mpc52xx_fec_mdio_priv *priv = bus->priv;
-        struct mpc52xx_fec __iomem *fec;
+        struct mpc52xx_fec __iomem *fec = priv->regs;
         int tries = 3;
 
         value |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
         value |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
 
-        fec = priv->regs;
         out_be32(&fec->ievent, FEC_IEVENT_MII);
-        out_be32(&priv->regs->mii_data, value);
+        out_be32(&fec->mii_data, value);
 
         /* wait for it to finish, this takes about 23 us on lite5200b */
         while (!(in_be32(&fec->ievent) & FEC_IEVENT_MII) && --tries)
@@ -47,7 +46,7 @@ static int mpc52xx_fec_mdio_transfer(struct mii_bus *bus, int phy_id,
                 return -ETIMEDOUT;
 
         return value & FEC_MII_DATA_OP_RD ?
-                in_be32(&priv->regs->mii_data) & FEC_MII_DATA_DATAMSK : 0;
+                in_be32(&fec->mii_data) & FEC_MII_DATA_DATAMSK : 0;
 }
 
 static int mpc52xx_fec_mdio_read(struct mii_bus *bus, int phy_id, int reg)
@@ -66,12 +65,11 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
                 const struct of_device_id *match)
 {
         struct device *dev = &of->dev;
-        struct device_node *np = of->node;
+        struct device_node *np = of->dev.of_node;
         struct mii_bus *bus;
         struct mpc52xx_fec_mdio_priv *priv;
-        struct resource res = {};
+        struct resource res;
         int err;
-        int i;
 
         bus = mdiobus_alloc();
         if (bus == NULL)
@@ -93,7 +91,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
         err = of_address_to_resource(np, 0, &res);
         if (err)
                 goto out_free;
-        priv->regs = ioremap(res.start, res.end - res.start + 1);
+        priv->regs = ioremap(res.start, resource_size(&res));
         if (priv->regs == NULL) {
                 err = -ENOMEM;
                 goto out_free;
@@ -107,7 +105,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
 
         /* set MII speed */
         out_be32(&priv->regs->mii_speed,
-                ((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1);
+                ((mpc5xxx_get_bus_frequency(of->dev.of_node) >> 20) / 5) << 1);
 
         err = of_mdiobus_register(bus, np);
         if (err)
@@ -118,10 +116,6 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
  out_unmap:
         iounmap(priv->regs);
  out_free:
-        for (i=0; i<PHY_MAX_ADDR; i++)
-                if (bus->irq[i] != PHY_POLL)
-                        irq_dispose_mapping(bus->irq[i]);
-        kfree(bus->irq);
         kfree(priv);
         mdiobus_free(bus);
 
@@ -133,23 +127,16 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
         struct device *dev = &of->dev;
         struct mii_bus *bus = dev_get_drvdata(dev);
         struct mpc52xx_fec_mdio_priv *priv = bus->priv;
-        int i;
 
         mdiobus_unregister(bus);
         dev_set_drvdata(dev, NULL);
-
         iounmap(priv->regs);
-        for (i=0; i<PHY_MAX_ADDR; i++)
-                if (bus->irq[i] != PHY_POLL)
-                        irq_dispose_mapping(bus->irq[i]);
         kfree(priv);
-        kfree(bus->irq);
         mdiobus_free(bus);
 
         return 0;
 }
 
-
 static struct of_device_id mpc52xx_fec_mdio_match[] = {
         { .compatible = "fsl,mpc5200b-mdio", },
         { .compatible = "fsl,mpc5200-mdio", },
@@ -159,14 +146,16 @@ static struct of_device_id mpc52xx_fec_mdio_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_mdio_match);
 
 struct of_platform_driver mpc52xx_fec_mdio_driver = {
-        .name = "mpc5200b-fec-phy",
+        .driver = {
+                .name = "mpc5200b-fec-phy",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_fec_mdio_match,
+        },
         .probe = mpc52xx_fec_mdio_probe,
         .remove = mpc52xx_fec_mdio_remove,
-        .match_table = mpc52xx_fec_mdio_match,
 };
 
 /* let fec driver call it, since this has to be registered before it */
 EXPORT_SYMBOL_GPL(mpc52xx_fec_mdio_driver);
 
-
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 0fb0fefcb78..309a0eaddd8 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1013,7 +1013,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
                 return -ENOMEM;
 
         if (!IS_FEC(match)) {
-                data = of_get_property(ofdev->node, "fsl,cpm-command", &len);
+                data = of_get_property(ofdev->dev.of_node, "fsl,cpm-command", &len);
                 if (!data || len != 4)
                         goto out_free_fpi;
 
@@ -1025,8 +1025,8 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
         fpi->rx_copybreak = 240;
         fpi->use_napi = 1;
         fpi->napi_weight = 17;
-        fpi->phy_node = of_parse_phandle(ofdev->node, "phy-handle", 0);
-        if ((!fpi->phy_node) && (!of_get_property(ofdev->node, "fixed-link",
+        fpi->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0);
+        if ((!fpi->phy_node) && (!of_get_property(ofdev->dev.of_node, "fixed-link",
                                                   NULL)))
                 goto out_free_fpi;
 
@@ -1059,7 +1059,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
         spin_lock_init(&fep->lock);
         spin_lock_init(&fep->tx_lock);
 
-        mac_addr = of_get_mac_address(ofdev->node);
+        mac_addr = of_get_mac_address(ofdev->dev.of_node);
         if (mac_addr)
                 memcpy(ndev->dev_addr, mac_addr, 6);
 
@@ -1156,8 +1156,11 @@ static struct of_device_id fs_enet_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_match);
 
 static struct of_platform_driver fs_enet_driver = {
-        .name   = "fs_enet",
-        .match_table = fs_enet_match,
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "fs_enet",
+                .of_match_table = fs_enet_match,
+        },
         .probe = fs_enet_probe,
         .remove = fs_enet_remove,
 };
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 714da967fa1..48e91b6242c 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -88,19 +88,19 @@ static int do_pd_setup(struct fs_enet_private *fep)
         struct fs_platform_info *fpi = fep->fpi;
         int ret = -EINVAL;
 
-        fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
+        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
         if (fep->interrupt == NO_IRQ)
                 goto out;
 
-        fep->fcc.fccp = of_iomap(ofdev->node, 0);
+        fep->fcc.fccp = of_iomap(ofdev->dev.of_node, 0);
         if (!fep->fcc.fccp)
                 goto out;
 
-        fep->fcc.ep = of_iomap(ofdev->node, 1);
+        fep->fcc.ep = of_iomap(ofdev->dev.of_node, 1);
         if (!fep->fcc.ep)
                 goto out_fccp;
 
-        fep->fcc.fcccp = of_iomap(ofdev->node, 2);
+        fep->fcc.fcccp = of_iomap(ofdev->dev.of_node, 2);
         if (!fep->fcc.fcccp)
                 goto out_ep;
 
@@ -504,17 +504,54 @@ static int get_regs_len(struct net_device *dev)
 }
 
 /* Some transmit errors cause the transmitter to shut
- * down.  We now issue a restart transmit.  Since the
- * errors close the BD and update the pointers, the restart
- * _should_ pick up without having to reset any of our
- * pointers either.  Also, To workaround 8260 device erratum
- * CPM37, we must disable and then re-enable the transmitter
- * following a Late Collision, Underrun, or Retry Limit error.
+ * down.  We now issue a restart transmit.
+ * Also, to workaround 8260 device erratum CPM37, we must
+ * disable and then re-enable the transmitterfollowing a
+ * Late Collision, Underrun, or Retry Limit error.
+ * In addition, tbptr may point beyond BDs beyond still marked
+ * as ready due to internal pipelining, so we need to look back
+ * through the BDs and adjust tbptr to point to the last BD
+ * marked as ready.  This may result in some buffers being
+ * retransmitted.
  */
 static void tx_restart(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
         fcc_t __iomem *fccp = fep->fcc.fccp;
+        const struct fs_platform_info *fpi = fep->fpi;
+        fcc_enet_t __iomem *ep = fep->fcc.ep;
+        cbd_t __iomem *curr_tbptr;
+        cbd_t __iomem *recheck_bd;
+        cbd_t __iomem *prev_bd;
+        cbd_t __iomem *last_tx_bd;
+
+        last_tx_bd = fep->tx_bd_base + (fpi->tx_ring * sizeof(cbd_t));
+
+        /* get the current bd held in TBPTR  and scan back from this point */
+        recheck_bd = curr_tbptr = (cbd_t __iomem *)
+                ((R32(ep, fen_genfcc.fcc_tbptr) - fep->ring_mem_addr) +
+                fep->ring_base);
+
+        prev_bd = (recheck_bd == fep->tx_bd_base) ? last_tx_bd : recheck_bd - 1;
+
+        /* Move through the bds in reverse, look for the earliest buffer
+         * that is not ready.  Adjust TBPTR to the following buffer */
+        while ((CBDR_SC(prev_bd) & BD_ENET_TX_READY) != 0) {
+                /* Go back one buffer */
+                recheck_bd = prev_bd;
+
+                /* update the previous buffer */
+                prev_bd = (prev_bd == fep->tx_bd_base) ? last_tx_bd : prev_bd - 1;
+
+                /* We should never see all bds marked as ready, check anyway */
+                if (recheck_bd == curr_tbptr)
+                        break;
+        }
+        /* Now update the TBPTR and dirty flag to the current buffer */
+        W32(ep, fen_genfcc.fcc_tbptr,
+                (uint) (((void *)recheck_bd - fep->ring_base) +
+                fep->ring_mem_addr));
+        fep->dirty_tx = recheck_bd;
 
         C32(fccp, fcc_gfmr, FCC_GFMR_ENT);
         udelay(10);
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 7eff92ef01d..7ca1642276d 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -98,11 +98,11 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
         struct of_device *ofdev = to_of_device(fep->dev);
 
-        fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
+        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
         if (fep->interrupt == NO_IRQ)
                 return -EINVAL;
 
-        fep->fec.fecp = of_iomap(ofdev->node, 0);
+        fep->fec.fecp = of_iomap(ofdev->dev.of_node, 0);
         if (!fep->fcc.fccp)
                 return -EINVAL;
 
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 7f0591e43cd..a3c44544846 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -98,15 +98,15 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
         struct of_device *ofdev = to_of_device(fep->dev);
 
-        fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
+        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
         if (fep->interrupt == NO_IRQ)
                 return -EINVAL;
 
-        fep->scc.sccp = of_iomap(ofdev->node, 0);
+        fep->scc.sccp = of_iomap(ofdev->dev.of_node, 0);
         if (!fep->scc.sccp)
                 return -EINVAL;
 
-        fep->scc.ep = of_iomap(ofdev->node, 1);
+        fep->scc.ep = of_iomap(ofdev->dev.of_node, 1);
         if (!fep->scc.ep) {
                 iounmap(fep->scc.sccp);
                 return -EINVAL;
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index 24ff9f43a62..0f90685d3d1 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -224,8 +224,11 @@ static struct of_device_id fs_enet_mdio_bb_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match);
 
 static struct of_platform_driver fs_enet_bb_mdio_driver = {
-        .name = "fsl-bb-mdio",
-        .match_table = fs_enet_mdio_bb_match,
+        .driver = {
+                .name = "fsl-bb-mdio",
+                .owner = THIS_MODULE,
+                .of_match_table = fs_enet_mdio_bb_match,
+        },
         .probe = fs_enet_mdio_probe,
         .remove = fs_enet_mdio_remove,
 };
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 5944b65082c..bddffd169b9 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -124,7 +124,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
         new_bus->write = &fs_enet_fec_mii_write;
         new_bus->reset = &fs_enet_fec_mii_reset;
 
-        ret = of_address_to_resource(ofdev->node, 0, &res);
+        ret = of_address_to_resource(ofdev->dev.of_node, 0, &res);
         if (ret)
                 goto out_res;
 
@@ -135,7 +135,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
                 goto out_fec;
 
         if (get_bus_freq) {
-                clock = get_bus_freq(ofdev->node);
+                clock = get_bus_freq(ofdev->dev.of_node);
                 if (!clock) {
                         /* Use maximum divider if clock is unknown */
                         dev_warn(&ofdev->dev, "could not determine IPS clock\n");
@@ -172,7 +172,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
         new_bus->parent = &ofdev->dev;
         dev_set_drvdata(&ofdev->dev, new_bus);
 
-        ret = of_mdiobus_register(new_bus, ofdev->node);
+        ret = of_mdiobus_register(new_bus, ofdev->dev.of_node);
         if (ret)
                 goto out_free_irqs;
 
@@ -222,8 +222,11 @@ static struct of_device_id fs_enet_mdio_fec_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match);
 
 static struct of_platform_driver fs_enet_fec_mdio_driver = {
-        .name = "fsl-fec-mdio",
-        .match_table = fs_enet_mdio_fec_match,
+        .driver = {
+                .name = "fsl-fec-mdio",
+                .owner = THIS_MODULE,
+                .of_match_table = fs_enet_mdio_fec_match,
+        },
         .probe = fs_enet_mdio_probe,
         .remove = fs_enet_mdio_remove,
 };
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index ff028f59b93..b4c41d72c42 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -267,7 +267,7 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)
 static int fsl_pq_mdio_probe(struct of_device *ofdev,
                 const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct device_node *tbi;
         struct fsl_pq_mdio_priv *priv;
         struct fsl_pq_mdio __iomem *regs = NULL;
@@ -471,10 +471,13 @@ static struct of_device_id fsl_pq_mdio_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match);
 
 static struct of_platform_driver fsl_pq_mdio_driver = {
-        .name = "fsl-pq_mdio",
+        .driver = {
+                .name = "fsl-pq_mdio",
+                .owner = THIS_MODULE,
+                .of_match_table = fsl_pq_mdio_match,
+        },
         .probe = fsl_pq_mdio_probe,
         .remove = fsl_pq_mdio_remove,
-        .match_table = fsl_pq_mdio_match,
 };
 
 int __init fsl_pq_mdio_init(void)
diff --git a/drivers/net/fsl_pq_mdio.h b/drivers/net/fsl_pq_mdio.h
index 1f7d865cedb..bd17a2a0139 100644
--- a/drivers/net/fsl_pq_mdio.h
+++ b/drivers/net/fsl_pq_mdio.h
@@ -39,7 +39,7 @@ struct fsl_pq_mdio {
         u8 reserved[28];        /* Space holder */
         u32 utbipar;            /* TBI phy address reg (only on UCC) */
         u8 res4[2728];
-} __attribute__ ((packed));
+} __packed;
 
 int fsl_pq_mdio_read(struct mii_bus *bus, int mii_id, int regnum);
 int fsl_pq_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index c6791cd4ee0..8a17bf096ff 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -608,7 +608,7 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
         int err = 0, i;
         struct net_device *dev = NULL;
         struct gfar_private *priv = NULL;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct device_node *child = NULL;
         const u32 *stash;
         const u32 *stash_len;
@@ -646,7 +646,7 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
                 return -ENOMEM;
 
         priv = netdev_priv(dev);
-        priv->node = ofdev->node;
+        priv->node = ofdev->dev.of_node;
         priv->ndev = dev;
 
         dev->num_tx_queues = num_tx_qs;
@@ -681,8 +681,8 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
                 priv->rx_queue[i] = NULL;
 
         for (i = 0; i < priv->num_tx_queues; i++) {
-                priv->tx_queue[i] =  (struct gfar_priv_tx_q *)kzalloc(
-                                sizeof (struct gfar_priv_tx_q), GFP_KERNEL);
+                priv->tx_queue[i] = kzalloc(sizeof(struct gfar_priv_tx_q),
+                                            GFP_KERNEL);
                 if (!priv->tx_queue[i]) {
                         err = -ENOMEM;
                         goto tx_alloc_failed;
@@ -694,8 +694,8 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
         }
 
         for (i = 0; i < priv->num_rx_queues; i++) {
-                priv->rx_queue[i] = (struct gfar_priv_rx_q *)kzalloc(
-                                        sizeof (struct gfar_priv_rx_q), GFP_KERNEL);
+                priv->rx_queue[i] = kzalloc(sizeof(struct gfar_priv_rx_q),
+                                            GFP_KERNEL);
                 if (!priv->rx_queue[i]) {
                         err = -ENOMEM;
                         goto rx_alloc_failed;
@@ -747,8 +747,7 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
                         FSL_GIANFAR_DEV_HAS_CSUM |
                         FSL_GIANFAR_DEV_HAS_VLAN |
                         FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
-                        FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
-                        FSL_GIANFAR_DEV_HAS_TIMER;
+                        FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
 
         ctype = of_get_property(np, "phy-connection-type", NULL);
 
@@ -939,7 +938,7 @@ static int gfar_probe(struct of_device *ofdev,
         priv = netdev_priv(dev);
         priv->ndev = dev;
         priv->ofdev = ofdev;
-        priv->node = ofdev->node;
+        priv->node = ofdev->dev.of_node;
         SET_NETDEV_DEV(dev, &ofdev->dev);
 
         spin_lock_init(&priv->bflock);
@@ -3167,12 +3166,14 @@ MODULE_DEVICE_TABLE(of, gfar_match);
 
 /* Structure for a device driver */
 static struct of_platform_driver gfar_driver = {
-        .name = "fsl-gianfar",
-        .match_table = gfar_match,
-
+        .driver = {
+                .name = "fsl-gianfar",
+                .owner = THIS_MODULE,
+                .pm = GFAR_PM_OPS,
+                .of_match_table = gfar_match,
+        },
         .probe = gfar_probe,
         .remove = gfar_remove,
-        .driver.pm = GFAR_PM_OPS,
 };
 
 static int __init gfar_init(void)
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index fd491e40948..4d09eab3548 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -1499,7 +1499,8 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev
         if (i == 6) {
                 const unsigned char *addr;
                 int len;
-                addr = of_get_property(ofdev->node, "local-mac-address", &len);
+                addr = of_get_property(ofdev->dev.of_node, "local-mac-address",
+                                        &len);
                 if (addr != NULL && len == 6) {
                         for (i = 0; i < 6; i++)
                                 macaddr[i] = (unsigned int) addr[i];
@@ -1554,7 +1555,6 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev
         }
 
         /* setup NAPI */
-        memset(&greth->napi, 0, sizeof(greth->napi));
         netif_napi_add(dev, &greth->napi, greth_poll, 64);
 
         return 0;
@@ -1606,14 +1606,13 @@ static struct of_device_id greth_of_match[] = {
 MODULE_DEVICE_TABLE(of, greth_of_match);
 
 static struct of_platform_driver greth_of_driver = {
-        .name = "grlib-greth",
-        .match_table = greth_of_match,
+        .driver = {
+                .name = "grlib-greth",
+                .owner = THIS_MODULE,
+                .of_match_table = greth_of_match,
+        },
         .probe = greth_of_probe,
         .remove = __devexit_p(greth_of_remove),
-        .driver = {
-                   .owner = THIS_MODULE,
-                   .name = "grlib-greth",
-                   },
 };
 
 static int __init greth_init(void)
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 694132e04af..4e7d1d0a234 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -1151,8 +1151,7 @@ static int __init yam_init_driver(void)
                 dev = alloc_netdev(sizeof(struct yam_port), name,
                                    yam_setup);
                 if (!dev) {
-                        printk(KERN_ERR "yam: cannot allocate net device %s\n",
-                               dev->name);
+                        pr_err("yam: cannot allocate net device\n");
                         err = -ENOMEM;
                         goto error;
                 }
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2484e9e6c1e..b150c102ca5 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -136,7 +136,8 @@ static inline void emac_report_timeout_error(struct emac_instance *dev,
                                   EMAC_FTR_440EP_PHY_CLK_FIX))
                 DBG(dev, "%s" NL, error);
         else if (net_ratelimit())
-                printk(KERN_ERR "%s: %s\n", dev->ofdev->node->full_name, error);
+                printk(KERN_ERR "%s: %s\n", dev->ofdev->dev.of_node->full_name,
+                        error);
 }
 
 /* EMAC PHY clock workaround:
@@ -2185,7 +2186,7 @@ static void emac_ethtool_get_drvinfo(struct net_device *ndev,
         strcpy(info->version, DRV_VERSION);
         info->fw_version[0] = '\0';
         sprintf(info->bus_info, "PPC 4xx EMAC-%d %s",
-                dev->cell_index, dev->ofdev->node->full_name);
+                dev->cell_index, dev->ofdev->dev.of_node->full_name);
         info->regdump_len = emac_ethtool_get_regs_len(ndev);
 }
 
@@ -2379,7 +2380,7 @@ static int __devinit emac_read_uint_prop(struct device_node *np, const char *nam
 
 static int __devinit emac_init_phy(struct emac_instance *dev)
 {
-        struct device_node *np = dev->ofdev->node;
+        struct device_node *np = dev->ofdev->dev.of_node;
         struct net_device *ndev = dev->ndev;
         u32 phy_map, adv;
         int i;
@@ -2514,7 +2515,7 @@ static int __devinit emac_init_phy(struct emac_instance *dev)
 
 static int __devinit emac_init_config(struct emac_instance *dev)
 {
-        struct device_node *np = dev->ofdev->node;
+        struct device_node *np = dev->ofdev->dev.of_node;
         const void *p;
         unsigned int plen;
         const char *pm, *phy_modes[] = {
@@ -2723,7 +2724,7 @@ static int __devinit emac_probe(struct of_device *ofdev,
 {
         struct net_device *ndev;
         struct emac_instance *dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct device_node **blist = NULL;
         int err, i;
 
@@ -2810,7 +2811,7 @@ static int __devinit emac_probe(struct of_device *ofdev,
         err = mal_register_commac(dev->mal, &dev->commac);
         if (err) {
                 printk(KERN_ERR "%s: failed to register with mal %s!\n",
-                       np->full_name, dev->mal_dev->node->full_name);
+                       np->full_name, dev->mal_dev->dev.of_node->full_name);
                 goto err_rel_deps;
         }
         dev->rx_skb_size = emac_rx_skb_size(ndev->mtu);
@@ -2995,9 +2996,11 @@ static struct of_device_id emac_match[] =
 MODULE_DEVICE_TABLE(of, emac_match);
 
 static struct of_platform_driver emac_driver = {
-        .name = "emac",
-        .match_table = emac_match,
-
+        .driver = {
+                .name = "emac",
+                .owner = THIS_MODULE,
+                .of_match_table = emac_match,
+        },
         .probe = emac_probe,
         .remove = emac_remove,
 };
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ibm_newemac/debug.c
index 775c850a425..3995fafc1e0 100644
--- a/drivers/net/ibm_newemac/debug.c
+++ b/drivers/net/ibm_newemac/debug.c
@@ -33,7 +33,7 @@ static void emac_desc_dump(struct emac_instance *p)
         int i;
         printk("** EMAC %s TX BDs **\n"
                " tx_cnt = %d tx_slot = %d ack_slot = %d\n",
-               p->ofdev->node->full_name,
+               p->ofdev->dev.of_node->full_name,
                p->tx_cnt, p->tx_slot, p->ack_slot);
         for (i = 0; i < NUM_TX_BUFF / 2; ++i)
                 printk
@@ -49,7 +49,7 @@ static void emac_desc_dump(struct emac_instance *p)
         printk("** EMAC %s RX BDs **\n"
                " rx_slot = %d flags = 0x%lx rx_skb_size = %d rx_sync_size = %d\n"
                " rx_sg_skb = 0x%p\n",
-               p->ofdev->node->full_name,
+               p->ofdev->dev.of_node->full_name,
                p->rx_slot, p->commac.flags, p->rx_skb_size,
                p->rx_sync_size, p->rx_sg_skb);
         for (i = 0; i < NUM_RX_BUFF / 2; ++i)
@@ -77,7 +77,8 @@ static void emac_mac_dump(struct emac_instance *dev)
                "MR0 = 0x%08x MR1 = 0x%08x TMR0 = 0x%08x TMR1 = 0x%08x\n"
                "RMR = 0x%08x ISR = 0x%08x ISER = 0x%08x\n"
                "IAR = %04x%08x VTPID = 0x%04x VTCI = 0x%04x\n",
-               dev->ofdev->node->full_name, in_be32(&p->mr0), in_be32(&p->mr1),
+               dev->ofdev->dev.of_node->full_name,
+               in_be32(&p->mr0), in_be32(&p->mr1),
                in_be32(&p->tmr0), in_be32(&p->tmr1),
                in_be32(&p->rmr), in_be32(&p->isr), in_be32(&p->iser),
                in_be32(&p->iahr), in_be32(&p->ialr), in_be32(&p->vtpid),
@@ -128,7 +129,7 @@ static void emac_mal_dump(struct mal_instance *mal)
                "CFG = 0x%08x ESR = 0x%08x IER = 0x%08x\n"
                "TX|CASR = 0x%08x CARR = 0x%08x EOBISR = 0x%08x DEIR = 0x%08x\n"
                "RX|CASR = 0x%08x CARR = 0x%08x EOBISR = 0x%08x DEIR = 0x%08x\n",
-               mal->ofdev->node->full_name,
+               mal->ofdev->dev.of_node->full_name,
                get_mal_dcrn(mal, MAL_CFG), get_mal_dcrn(mal, MAL_ESR),
                get_mal_dcrn(mal, MAL_IER),
                get_mal_dcrn(mal, MAL_TXCASR), get_mal_dcrn(mal, MAL_TXCARR),
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ibm_newemac/debug.h
index b631842ec8d..e596c77ccdf 100644
--- a/drivers/net/ibm_newemac/debug.h
+++ b/drivers/net/ibm_newemac/debug.h
@@ -53,8 +53,8 @@ extern void emac_dbg_dump_all(void);
 
 #endif
 
-#define EMAC_DBG(dev, name, fmt, arg...) \
-        printk(KERN_DEBUG #name "%s: " fmt, dev->ofdev->node->full_name, ## arg)
+#define EMAC_DBG(d, name, fmt, arg...) \
+        printk(KERN_DEBUG #name "%s: " fmt, d->ofdev->dev.of_node->full_name, ## arg)
 
 #if DBG_LEVEL > 0
 #  define DBG(d,f,x...)         EMAC_DBG(d, emac, f, ##x)
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index 5b3d94419fe..fcff9e0bd38 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -538,11 +538,11 @@ static int __devinit mal_probe(struct of_device *ofdev,
         }
         mal->index = index;
         mal->ofdev = ofdev;
-        mal->version = of_device_is_compatible(ofdev->node, "ibm,mcmal2") ? 2 : 1;
+        mal->version = of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal2") ? 2 : 1;
 
         MAL_DBG(mal, "probe" NL);
 
-        prop = of_get_property(ofdev->node, "num-tx-chans", NULL);
+        prop = of_get_property(ofdev->dev.of_node, "num-tx-chans", NULL);
         if (prop == NULL) {
                 printk(KERN_ERR
                        "mal%d: can't find MAL num-tx-chans property!\n",
@@ -552,7 +552,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
         }
         mal->num_tx_chans = prop[0];
 
-        prop = of_get_property(ofdev->node, "num-rx-chans", NULL);
+        prop = of_get_property(ofdev->dev.of_node, "num-rx-chans", NULL);
         if (prop == NULL) {
                 printk(KERN_ERR
                        "mal%d: can't find MAL num-rx-chans property!\n",
@@ -562,14 +562,14 @@ static int __devinit mal_probe(struct of_device *ofdev,
         }
         mal->num_rx_chans = prop[0];
 
-        dcr_base = dcr_resource_start(ofdev->node, 0);
+        dcr_base = dcr_resource_start(ofdev->dev.of_node, 0);
         if (dcr_base == 0) {
                 printk(KERN_ERR
                        "mal%d: can't find DCR resource!\n", index);
                 err = -ENODEV;
                 goto fail;
         }
-        mal->dcr_host = dcr_map(ofdev->node, dcr_base, 0x100);
+        mal->dcr_host = dcr_map(ofdev->dev.of_node, dcr_base, 0x100);
         if (!DCR_MAP_OK(mal->dcr_host)) {
                 printk(KERN_ERR
                        "mal%d: failed to map DCRs !\n", index);
@@ -577,28 +577,28 @@ static int __devinit mal_probe(struct of_device *ofdev,
                 goto fail;
         }
 
-        if (of_device_is_compatible(ofdev->node, "ibm,mcmal-405ez")) {
+        if (of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal-405ez")) {
 #if defined(CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT) && \
                 defined(CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR)
                 mal->features |= (MAL_FTR_CLEAR_ICINTSTAT |
                                 MAL_FTR_COMMON_ERR_INT);
 #else
                 printk(KERN_ERR "%s: Support for 405EZ not enabled!\n",
-                                ofdev->node->full_name);
+                                ofdev->dev.of_node->full_name);
                 err = -ENODEV;
                 goto fail;
 #endif
         }
 
-        mal->txeob_irq = irq_of_parse_and_map(ofdev->node, 0);
-        mal->rxeob_irq = irq_of_parse_and_map(ofdev->node, 1);
-        mal->serr_irq = irq_of_parse_and_map(ofdev->node, 2);
+        mal->txeob_irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
+        mal->rxeob_irq = irq_of_parse_and_map(ofdev->dev.of_node, 1);
+        mal->serr_irq = irq_of_parse_and_map(ofdev->dev.of_node, 2);
 
         if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {
                 mal->txde_irq = mal->rxde_irq = mal->serr_irq;
         } else {
-                mal->txde_irq = irq_of_parse_and_map(ofdev->node, 3);
-                mal->rxde_irq = irq_of_parse_and_map(ofdev->node, 4);
+                mal->txde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 3);
+                mal->rxde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 4);
         }
 
         if (mal->txeob_irq == NO_IRQ || mal->rxeob_irq == NO_IRQ ||
@@ -629,7 +629,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
         /* Current Axon is not happy with priority being non-0, it can
          * deadlock, fix it up here
          */
-        if (of_device_is_compatible(ofdev->node, "ibm,mcmal-axon"))
+        if (of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal-axon"))
                 cfg &= ~(MAL2_CFG_RPP_10 | MAL2_CFG_WPP_10);
 
         /* Apply configuration */
@@ -701,7 +701,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
 
         printk(KERN_INFO
                "MAL v%d %s, %d TX channels, %d RX channels\n",
-               mal->version, ofdev->node->full_name,
+               mal->version, ofdev->dev.of_node->full_name,
                mal->num_tx_chans, mal->num_rx_chans);
 
         /* Advertise this instance to the rest of the world */
@@ -790,9 +790,11 @@ static struct of_device_id mal_platform_match[] =
 };
 
 static struct of_platform_driver mal_of_driver = {
-        .name = "mcmal",
-        .match_table = mal_platform_match,
-
+        .driver = {
+                .name = "mcmal",
+                .owner = THIS_MODULE,
+                .of_match_table = mal_platform_match,
+        },
         .probe = mal_probe,
         .remove = mal_remove,
 };
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index 5b90d34c845..108919bcdf1 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -103,7 +103,7 @@ int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
         /* Check if we need to attach to a RGMII */
         if (input < 0 || !rgmii_valid_mode(mode)) {
                 printk(KERN_ERR "%s: unsupported settings !\n",
-                       ofdev->node->full_name);
+                       ofdev->dev.of_node->full_name);
                 return -ENODEV;
         }
 
@@ -113,7 +113,7 @@ int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
         out_be32(&p->fer, in_be32(&p->fer) | rgmii_mode_mask(mode, input));
 
         printk(KERN_NOTICE "%s: input %d in %s mode\n",
-               ofdev->node->full_name, input, rgmii_mode_name(mode));
+               ofdev->dev.of_node->full_name, input, rgmii_mode_name(mode));
 
         ++dev->users;
 
@@ -231,7 +231,7 @@ void *rgmii_dump_regs(struct of_device *ofdev, void *buf)
 static int __devinit rgmii_probe(struct of_device *ofdev,
                                  const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct rgmii_instance *dev;
         struct resource regs;
         int rc;
@@ -264,11 +264,11 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
         }
 
         /* Check for RGMII flags */
-        if (of_get_property(ofdev->node, "has-mdio", NULL))
+        if (of_get_property(ofdev->dev.of_node, "has-mdio", NULL))
                 dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
 
         /* CAB lacks the right properties, fix this up */
-        if (of_device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
+        if (of_device_is_compatible(ofdev->dev.of_node, "ibm,rgmii-axon"))
                 dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
 
         DBG2(dev, " Boot FER = 0x%08x, SSR = 0x%08x\n",
@@ -279,7 +279,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
 
         printk(KERN_INFO
                "RGMII %s initialized with%s MDIO support\n",
-               ofdev->node->full_name,
+               ofdev->dev.of_node->full_name,
                (dev->flags & EMAC_RGMII_FLAG_HAS_MDIO) ? "" : "out");
 
         wmb();
@@ -319,9 +319,11 @@ static struct of_device_id rgmii_match[] =
 };
 
 static struct of_platform_driver rgmii_driver = {
-        .name = "emac-rgmii",
-        .match_table = rgmii_match,
-
+        .driver = {
+                .name = "emac-rgmii",
+                .owner = THIS_MODULE,
+                .of_match_table = rgmii_match,
+        },
         .probe = rgmii_probe,
         .remove = rgmii_remove,
 };
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index 30173a9fb55..044637144c4 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -57,7 +57,8 @@ void tah_reset(struct of_device *ofdev)
                 --n;
 
         if (unlikely(!n))
-                printk(KERN_ERR "%s: reset timeout\n", ofdev->node->full_name);
+                printk(KERN_ERR "%s: reset timeout\n",
+                        ofdev->dev.of_node->full_name);
 
         /* 10KB TAH TX FIFO accomodates the max MTU of 9000 */
         out_be32(&p->mr,
@@ -89,7 +90,7 @@ void *tah_dump_regs(struct of_device *ofdev, void *buf)
 static int __devinit tah_probe(struct of_device *ofdev,
                                const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct tah_instance *dev;
         struct resource regs;
         int rc;
@@ -127,7 +128,7 @@ static int __devinit tah_probe(struct of_device *ofdev,
         tah_reset(ofdev);
 
         printk(KERN_INFO
-               "TAH %s initialized\n", ofdev->node->full_name);
+               "TAH %s initialized\n", ofdev->dev.of_node->full_name);
         wmb();
 
         return 0;
@@ -165,9 +166,11 @@ static struct of_device_id tah_match[] =
 };
 
 static struct of_platform_driver tah_driver = {
-        .name = "emac-tah",
-        .match_table = tah_match,
-
+        .driver = {
+                .name = "emac-tah",
+                .owner = THIS_MODULE,
+                .of_match_table = tah_match,
+        },
         .probe = tah_probe,
         .remove = tah_remove,
 };
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 1f038f808ab..046dcd069c4 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -121,13 +121,14 @@ int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
                         dev->mode = *mode;
 
                 printk(KERN_NOTICE "%s: bridge in %s mode\n",
-                       ofdev->node->full_name, zmii_mode_name(dev->mode));
+                       ofdev->dev.of_node->full_name,
+                       zmii_mode_name(dev->mode));
         } else {
                 /* All inputs must use the same mode */
                 if (*mode != PHY_MODE_NA && *mode != dev->mode) {
                         printk(KERN_ERR
                                "%s: invalid mode %d specified for input %d\n",
-                               ofdev->node->full_name, *mode, input);
+                               ofdev->dev.of_node->full_name, *mode, input);
                         mutex_unlock(&dev->lock);
                         return -EINVAL;
                 }
@@ -233,7 +234,7 @@ void *zmii_dump_regs(struct of_device *ofdev, void *buf)
 static int __devinit zmii_probe(struct of_device *ofdev,
                                 const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct zmii_instance *dev;
         struct resource regs;
         int rc;
@@ -273,7 +274,7 @@ static int __devinit zmii_probe(struct of_device *ofdev,
         out_be32(&dev->base->fer, 0);
 
         printk(KERN_INFO
-               "ZMII %s initialized\n", ofdev->node->full_name);
+               "ZMII %s initialized\n", ofdev->dev.of_node->full_name);
         wmb();
         dev_set_drvdata(&ofdev->dev, dev);
 
@@ -312,9 +313,11 @@ static struct of_device_id zmii_match[] =
 };
 
 static struct of_platform_driver zmii_driver = {
-        .name = "emac-zmii",
-        .match_table = zmii_match,
-
+        .driver = {
+                .name = "emac-zmii",
+                .owner = THIS_MODULE,
+                .of_match_table = zmii_match,
+        },
         .probe = zmii_probe,
         .remove = zmii_remove,
 };
diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
index 911c082cee5..f940dfa1f7f 100644
--- a/drivers/net/irda/bfin_sir.c
+++ b/drivers/net/irda/bfin_sir.c
@@ -107,8 +107,12 @@ static int bfin_sir_set_speed(struct bfin_sir_port *port, int speed)
         case 57600:
         case 115200:
 
-                quot = (port->clk + (8 * speed)) / (16 * speed)\
-                                                - ANOMALY_05000230;
+                /*
+                 * IRDA is not affected by anomaly 05000230, so there is no
+                 * need to tweak the divisor like he UART driver (which will
+                 * slightly speed up the baud rate on us).
+                 */
+                quot = (port->clk + (8 * speed)) / (16 * speed);
 
                 do {
                         udelay(utime);
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h
index 0dbd1932b72..36c3060411d 100644
--- a/drivers/net/irda/donauboe.h
+++ b/drivers/net/irda/donauboe.h
@@ -273,7 +273,7 @@ struct OboeSlot
   __u8 control;                 /*Slot control/status see below */
   __u32 address;                /*Slot buffer address */
 }
-__attribute__ ((packed));
+__packed;
 
 #define OBOE_NTASKS OBOE_TXRING_OFFSET_IN_SLOTS
 
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h
index ac0443d52e5..58ddb521491 100644
--- a/drivers/net/irda/irda-usb.h
+++ b/drivers/net/irda/irda-usb.h
@@ -125,7 +125,7 @@ struct irda_class_desc {
         __u8  bmAdditionalBOFs;
         __u8  bIrdaRateSniff;
         __u8  bMaxUnicastList;
-} __attribute__ ((packed));
+} __packed;
 
 /* class specific interface request to get the IrDA-USB class descriptor
  * (6.2.5, USB-IrDA class spec 1.0) */
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index b54d3b48045..1046014dd6c 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -154,7 +154,7 @@ struct ks959_speedparams {
         __le32 baudrate;        /* baud rate, little endian */
         __u8 flags;
         __u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define KS_DATA_5_BITS 0x00
 #define KS_DATA_6_BITS 0x01
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 8d713ebac15..9cc142fcc71 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -117,7 +117,7 @@ struct ksdazzle_speedparams {
         __le32 baudrate;        /* baud rate, little endian */
         __u8 flags;
         __u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define KS_DATA_5_BITS 0x00
 #define KS_DATA_6_BITS 0x01
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index 3050d1a0ccc..3f24a1f3302 100644
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -544,9 +544,9 @@ struct ring_descr_hw {
                 struct {
                         u8              addr_res[3];
                         volatile u8     status;         /* descriptor status */
-                } __attribute__((packed)) rd_s;
-        } __attribute((packed)) rd_u;
-} __attribute__ ((packed));
+                } __packed rd_s;
+        } __packed rd_u;
+} __packed;
 
 #define rd_addr         rd_u.addr
 #define rd_status       rd_u.rd_s.status
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index ffae480587a..9e15eb93860 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -44,11 +44,9 @@
 #include <linux/dca.h>
 #endif
 
-#define PFX "ixgbe: "
-#define DPRINTK(nlevel, klevel, fmt, args...) \
-        ((void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
-        printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \
-                __func__ , ## args)))
+/* common prefix used by pr_<> macros */
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 /* TX/RX descriptor defines */
 #define IXGBE_DEFAULT_TXD                   512
@@ -112,7 +110,6 @@ struct vf_data_storage {
         u16 vlans_enabled;
         bool clear_to_send;
         bool pf_set_mac;
-        int rar;
         u16 pf_vlan; /* When set, guest VLAN config not allowed. */
         u16 pf_qos;
 };
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index a4e2901f2f0..976fd9e146c 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -707,9 +707,8 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
 
 out:
         if (link_up && (link_speed == IXGBE_LINK_SPEED_1GB_FULL))
-                netif_info(adapter, hw, adapter->netdev, "Smartspeed has"
-                        " downgraded the link speed from the maximum"
-                        " advertised\n");
+                e_info("Smartspeed has downgraded the link speed from "
+                       "the maximum advertised\n");
         return status;
 }
 
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 1159d9138f0..9595b1bfb8d 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1188,6 +1188,7 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
                 IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
         } else {
                 hw_dbg(hw, "RAR index %d is out of range.\n", index);
+                return IXGBE_ERR_RAR_INDEX;
         }
 
         return 0;
@@ -1219,6 +1220,7 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index)
                 IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
         } else {
                 hw_dbg(hw, "RAR index %d is out of range.\n", index);
+                return IXGBE_ERR_RAR_INDEX;
         }
 
         /* clear VMDq pool/queue selection for this RAR */
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 3080afb12bd..d5d3aae8524 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -105,12 +105,26 @@ s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index);
 
 #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
 
-#ifdef DEBUG
-extern char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw);
+extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw);
 #define hw_dbg(hw, format, arg...) \
-        printk(KERN_DEBUG "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg)
-#else
-#define hw_dbg(hw, format, arg...) do {} while (0)
-#endif
+        netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg)
+#define e_err(format, arg...) \
+        netdev_err(adapter->netdev, format, ## arg)
+#define e_info(format, arg...) \
+        netdev_info(adapter->netdev, format, ## arg)
+#define e_warn(format, arg...) \
+        netdev_warn(adapter->netdev, format, ## arg)
+#define e_notice(format, arg...) \
+        netdev_notice(adapter->netdev, format, ## arg)
+#define e_crit(format, arg...) \
+        netdev_crit(adapter->netdev, format, ## arg)
+#define e_dev_info(format, arg...) \
+        dev_info(&adapter->pdev->dev, format, ## arg)
+#define e_dev_warn(format, arg...) \
+        dev_warn(&adapter->pdev->dev, format, ## arg)
+#define e_dev_err(format, arg...) \
+        dev_err(&adapter->pdev->dev, format, ## arg)
+#define e_dev_notice(format, arg...) \
+        dev_notice(&adapter->pdev->dev, format, ## arg)
 
 #endif /* IXGBE_COMMON */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index 71da325dfa8..657623589d5 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -121,7 +121,7 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                         goto out;
 
                 if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
-                        DPRINTK(DRV, ERR, "Enable failed, needs MSI-X\n");
+                        e_err("Enable failed, needs MSI-X\n");
                         err = 1;
                         goto out;
                 }
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index c50a7541ffe..873b45efca4 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -294,8 +294,7 @@ static int ixgbe_set_settings(struct net_device *netdev,
                 hw->mac.autotry_restart = true;
                 err = hw->mac.ops.setup_link(hw, advertised, true, true);
                 if (err) {
-                        DPRINTK(PROBE, INFO,
-                                "setup link failed with code %d\n", err);
+                        e_info("setup link failed with code %d\n", err);
                         hw->mac.ops.setup_link(hw, old, true, true);
                 }
         } else {
@@ -1188,9 +1187,9 @@ static struct ixgbe_reg_test reg_test_82598[] = {
                 writel((_test[pat] & W), (adapter->hw.hw_addr + R));          \
                 val = readl(adapter->hw.hw_addr + R);                         \
                 if (val != (_test[pat] & W & M)) {                            \
-                        DPRINTK(DRV, ERR, "pattern test reg %04X failed: got "\
-                                          "0x%08X expected 0x%08X\n",         \
-                                R, val, (_test[pat] & W & M));                \
+                        e_err("pattern test reg %04X failed: got "      \
+                              "0x%08X expected 0x%08X\n",               \
+                              R, val, (_test[pat] & W & M));                \
                         *data = R;                                            \
                         writel(before, adapter->hw.hw_addr + R);              \
                         return 1;                                             \
@@ -1206,8 +1205,8 @@ static struct ixgbe_reg_test reg_test_82598[] = {
         writel((W & M), (adapter->hw.hw_addr + R));                           \
         val = readl(adapter->hw.hw_addr + R);                                 \
         if ((W & M) != (val & M)) {                                           \
-                DPRINTK(DRV, ERR, "set/check reg %04X test failed: got 0x%08X "\
-                                 "expected 0x%08X\n", R, (val & M), (W & M)); \
+                e_err("set/check reg %04X test failed: got 0x%08X "     \
+                      "expected 0x%08X\n", R, (val & M), (W & M));      \
                 *data = R;                                                    \
                 writel(before, (adapter->hw.hw_addr + R));                    \
                 return 1;                                                     \
@@ -1240,8 +1239,8 @@ static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data)
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_STATUS, toggle);
         after = IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS) & toggle;
         if (value != after) {
-                DPRINTK(DRV, ERR, "failed STATUS register test got: "
-                        "0x%08X expected: 0x%08X\n", after, value);
+                e_err("failed STATUS register test got: 0x%08X expected: "
+                      "0x%08X\n", after, value);
                 *data = 1;
                 return 1;
         }
@@ -1341,8 +1340,8 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data)
                 *data = 1;
                 return -1;
         }
-        DPRINTK(HW, INFO, "testing %s interrupt\n",
-                (shared_int ? "shared" : "unshared"));
+        e_info("testing %s interrupt\n", shared_int ?
+                   "shared" : "unshared");
 
         /* Disable all the interrupts */
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);
@@ -1847,7 +1846,7 @@ static void ixgbe_diag_test(struct net_device *netdev,
         if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
                 /* Offline tests */
 
-                DPRINTK(HW, INFO, "offline testing starting\n");
+                e_info("offline testing starting\n");
 
                 /* Link test performed before hardware reset so autoneg doesn't
                  * interfere with test result */
@@ -1880,17 +1879,17 @@ static void ixgbe_diag_test(struct net_device *netdev,
                 else
                         ixgbe_reset(adapter);
 
-                DPRINTK(HW, INFO, "register testing starting\n");
+                e_info("register testing starting\n");
                 if (ixgbe_reg_test(adapter, &data[0]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
                 ixgbe_reset(adapter);
-                DPRINTK(HW, INFO, "eeprom testing starting\n");
+                e_info("eeprom testing starting\n");
                 if (ixgbe_eeprom_test(adapter, &data[1]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
                 ixgbe_reset(adapter);
-                DPRINTK(HW, INFO, "interrupt testing starting\n");
+                e_info("interrupt testing starting\n");
                 if (ixgbe_intr_test(adapter, &data[2]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
@@ -1898,14 +1897,13 @@ static void ixgbe_diag_test(struct net_device *netdev,
                  * loopback diagnostic. */
                 if (adapter->flags & (IXGBE_FLAG_SRIOV_ENABLED |
                                       IXGBE_FLAG_VMDQ_ENABLED)) {
-                        DPRINTK(HW, INFO, "Skip MAC loopback diagnostic in VT "
-                                "mode\n");
+                        e_info("Skip MAC loopback diagnostic in VT mode\n");
                         data[3] = 0;
                         goto skip_loopback;
                 }
 
                 ixgbe_reset(adapter);
-                DPRINTK(HW, INFO, "loopback testing starting\n");
+                e_info("loopback testing starting\n");
                 if (ixgbe_loopback_test(adapter, &data[3]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
@@ -1916,7 +1914,7 @@ skip_loopback:
                 if (if_running)
                         dev_open(netdev);
         } else {
-                DPRINTK(HW, INFO, "online testing starting\n");
+                e_info("online testing starting\n");
                 /* Online tests */
                 if (ixgbe_link_test(adapter, &data[4]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -2077,25 +2075,6 @@ static int ixgbe_get_coalesce(struct net_device *netdev,
         return 0;
 }
 
-/*
- * this function must be called before setting the new value of
- * rx_itr_setting
- */
-static bool ixgbe_reenable_rsc(struct ixgbe_adapter *adapter,
-                               struct ethtool_coalesce *ec)
-{
-        /* check the old value and enable RSC if necessary */
-        if ((adapter->rx_itr_setting == 0) &&
-            (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)) {
-                adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;
-                adapter->netdev->features |= NETIF_F_LRO;
-                DPRINTK(PROBE, INFO, "rx-usecs set to %d, re-enabling RSC\n",
-                        ec->rx_coalesce_usecs);
-                return true;
-        }
-        return false;
-}
-
 static int ixgbe_set_coalesce(struct net_device *netdev,
                               struct ethtool_coalesce *ec)
 {
@@ -2124,9 +2103,6 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
                     (1000000/ec->rx_coalesce_usecs < IXGBE_MIN_INT_RATE))
                         return -EINVAL;
 
-                /* check the old value and enable RSC if necessary */
-                need_reset = ixgbe_reenable_rsc(adapter, ec);
-
                 /* store the value in ints/second */
                 adapter->rx_eitr_param = 1000000/ec->rx_coalesce_usecs;
 
@@ -2135,9 +2111,6 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
                 /* clear the lower bit as its used for dynamic state */
                 adapter->rx_itr_setting &= ~1;
         } else if (ec->rx_coalesce_usecs == 1) {
-                /* check the old value and enable RSC if necessary */
-                need_reset = ixgbe_reenable_rsc(adapter, ec);
-
                 /* 1 means dynamic mode */
                 adapter->rx_eitr_param = 20000;
                 adapter->rx_itr_setting = 1;
@@ -2157,10 +2130,10 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
                  */
                 if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                         adapter->flags2 &= ~IXGBE_FLAG2_RSC_ENABLED;
-                        netdev->features &= ~NETIF_F_LRO;
-                        DPRINTK(PROBE, INFO,
-                                "rx-usecs set to 0, disabling RSC\n");
-
+                        if (netdev->features & NETIF_F_LRO) {
+                                netdev->features &= ~NETIF_F_LRO;
+                                e_info("rx-usecs set to 0, disabling RSC\n");
+                        }
                         need_reset = true;
                 }
         }
@@ -2255,6 +2228,9 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data)
                         }
                 } else if (!adapter->rx_itr_setting) {
                         netdev->features &= ~ETH_FLAG_LRO;
+                        if (data & ETH_FLAG_LRO)
+                                e_info("rx-usecs set to 0, "
+                                        "LRO/RSC cannot be enabled.\n");
                 }
         }
 
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 45182ab41d6..84e1194e083 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -25,7 +25,6 @@
 
 *******************************************************************************/
 
-
 #include "ixgbe.h"
 #ifdef CONFIG_IXGBE_DCB
 #include "ixgbe_dcb_82599.h"
@@ -165,20 +164,20 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
 
         adapter = netdev_priv(netdev);
         if (xid >= IXGBE_FCOE_DDP_MAX) {
-                DPRINTK(DRV, WARNING, "xid=0x%x out-of-range\n", xid);
+                e_warn("xid=0x%x out-of-range\n", xid);
                 return 0;
         }
 
         fcoe = &adapter->fcoe;
         if (!fcoe->pool) {
-                DPRINTK(DRV, WARNING, "xid=0x%x no ddp pool for fcoe\n", xid);
+                e_warn("xid=0x%x no ddp pool for fcoe\n", xid);
                 return 0;
         }
 
         ddp = &fcoe->ddp[xid];
         if (ddp->sgl) {
-                DPRINTK(DRV, ERR, "xid 0x%x w/ non-null sgl=%p nents=%d\n",
-                        xid, ddp->sgl, ddp->sgc);
+                e_err("xid 0x%x w/ non-null sgl=%p nents=%d\n",
+                          xid, ddp->sgl, ddp->sgc);
                 return 0;
         }
         ixgbe_fcoe_clear_ddp(ddp);
@@ -186,14 +185,14 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
         /* setup dma from scsi command sgl */
         dmacount = pci_map_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);
         if (dmacount == 0) {
-                DPRINTK(DRV, ERR, "xid 0x%x DMA map error\n", xid);
+                e_err("xid 0x%x DMA map error\n", xid);
                 return 0;
         }
 
         /* alloc the udl from our ddp pool */
         ddp->udl = pci_pool_alloc(fcoe->pool, GFP_KERNEL, &ddp->udp);
         if (!ddp->udl) {
-                DPRINTK(DRV, ERR, "failed allocated ddp context\n");
+                e_err("failed allocated ddp context\n");
                 goto out_noddp_unmap;
         }
         ddp->sgl = sgl;
@@ -206,10 +205,9 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
                 while (len) {
                         /* max number of buffers allowed in one DDP context */
                         if (j >= IXGBE_BUFFCNT_MAX) {
-                                netif_err(adapter, drv, adapter->netdev,
-                                          "xid=%x:%d,%d,%d:addr=%llx "
-                                          "not enough descriptors\n",
-                                          xid, i, j, dmacount, (u64)addr);
+                                e_err("xid=%x:%d,%d,%d:addr=%llx "
+                                      "not enough descriptors\n",
+                                      xid, i, j, dmacount, (u64)addr);
                                 goto out_noddp_free;
                         }
 
@@ -387,8 +385,8 @@ int ixgbe_fso(struct ixgbe_adapter *adapter,
         struct fc_frame_header *fh;
 
         if (skb_is_gso(skb) && (skb_shinfo(skb)->gso_type != SKB_GSO_FCOE)) {
-                DPRINTK(DRV, ERR, "Wrong gso type %d:expecting SKB_GSO_FCOE\n",
-                        skb_shinfo(skb)->gso_type);
+                e_err("Wrong gso type %d:expecting SKB_GSO_FCOE\n",
+                      skb_shinfo(skb)->gso_type);
                 return -EINVAL;
         }
 
@@ -414,7 +412,7 @@ int ixgbe_fso(struct ixgbe_adapter *adapter,
                 fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_SOF;
                 break;
         default:
-                DPRINTK(DRV, WARNING, "unknown sof = 0x%x\n", sof);
+                e_warn("unknown sof = 0x%x\n", sof);
                 return -EINVAL;
         }
 
@@ -441,7 +439,7 @@ int ixgbe_fso(struct ixgbe_adapter *adapter,
                 fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_A;
                 break;
         default:
-                DPRINTK(DRV, WARNING, "unknown eof = 0x%x\n", eof);
+                e_warn("unknown eof = 0x%x\n", eof);
                 return -EINVAL;
         }
 
@@ -517,8 +515,7 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                                              adapter->pdev, IXGBE_FCPTR_MAX,
                                              IXGBE_FCPTR_ALIGN, PAGE_SIZE);
                 if (!fcoe->pool)
-                        DPRINTK(DRV, ERR,
-                                "failed to allocated FCoE DDP pool\n");
+                        e_err("failed to allocated FCoE DDP pool\n");
 
                 spin_lock_init(&fcoe->lock);
         }
@@ -614,7 +611,7 @@ int ixgbe_fcoe_enable(struct net_device *netdev)
         if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
                 goto out_enable;
 
-        DPRINTK(DRV, INFO, "Enabling FCoE offload features.\n");
+        e_info("Enabling FCoE offload features.\n");
         if (netif_running(netdev))
                 netdev->netdev_ops->ndo_stop(netdev);
 
@@ -660,7 +657,7 @@ int ixgbe_fcoe_disable(struct net_device *netdev)
         if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
                 goto out_disable;
 
-        DPRINTK(DRV, INFO, "Disabling FCoE offload features.\n");
+        e_info("Disabling FCoE offload features.\n");
         if (netif_running(netdev))
                 netdev->netdev_ops->ndo_stop(netdev);
 
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index d571d101de0..ebc4b04fdef 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -642,7 +642,7 @@ static inline bool ixgbe_tx_xon_state(struct ixgbe_adapter *adapter,
         u32 txoff = IXGBE_TFCS_TXOFF;
 
 #ifdef CONFIG_IXGBE_DCB
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+        if (adapter->dcb_cfg.pfc_mode_enable) {
                 int tc;
                 int reg_idx = tx_ring->reg_idx;
                 int dcb_i = adapter->ring_feature[RING_F_DCB].indices;
@@ -696,19 +696,19 @@ static inline bool ixgbe_check_tx_hang(struct ixgbe_adapter *adapter,
                 /* detected Tx unit hang */
                 union ixgbe_adv_tx_desc *tx_desc;
                 tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
-                DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"
-                        "  Tx Queue             <%d>\n"
-                        "  TDH, TDT             <%x>, <%x>\n"
-                        "  next_to_use          <%x>\n"
-                        "  next_to_clean        <%x>\n"
-                        "tx_buffer_info[next_to_clean]\n"
-                        "  time_stamp           <%lx>\n"
-                        "  jiffies              <%lx>\n",
-                        tx_ring->queue_index,
-                        IXGBE_READ_REG(hw, tx_ring->head),
-                        IXGBE_READ_REG(hw, tx_ring->tail),
-                        tx_ring->next_to_use, eop,
-                        tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
+                e_err("Detected Tx Unit Hang\n"
+                      "  Tx Queue             <%d>\n"
+                      "  TDH, TDT             <%x>, <%x>\n"
+                      "  next_to_use          <%x>\n"
+                      "  next_to_clean        <%x>\n"
+                      "tx_buffer_info[next_to_clean]\n"
+                      "  time_stamp           <%lx>\n"
+                      "  jiffies              <%lx>\n",
+                      tx_ring->queue_index,
+                      IXGBE_READ_REG(hw, tx_ring->head),
+                      IXGBE_READ_REG(hw, tx_ring->tail),
+                      tx_ring->next_to_use, eop,
+                      tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
                 return true;
         }
 
@@ -812,9 +812,8 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
         if (adapter->detect_tx_hung) {
                 if (ixgbe_check_tx_hang(adapter, tx_ring, i)) {
                         /* schedule immediate reset if we believe we hung */
-                        DPRINTK(PROBE, INFO,
-                                "tx hang %d detected, resetting adapter\n",
-                                adapter->tx_timeout_count + 1);
+                        e_info("tx hang %d detected, resetting adapter\n",
+                               adapter->tx_timeout_count + 1);
                         ixgbe_tx_timeout(adapter->netdev);
                 }
         }
@@ -1653,10 +1652,10 @@ static void ixgbe_check_overtemp_task(struct work_struct *work)
                                 return;
                         break;
                 }
-                DPRINTK(DRV, ERR, "Network adapter has been stopped because it "
-                        "has over heated. Restart the computer. If the problem "
-                        "persists, power off the system and replace the "
-                        "adapter\n");
+                e_crit("Network adapter has been stopped because it "
+                       "has over heated. Restart the computer. If the problem "
+                       "persists, power off the system and replace the "
+                       "adapter\n");
                 /* write to clear the interrupt */
                 IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP0);
         }
@@ -1668,7 +1667,7 @@ static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)
 
         if ((adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) &&
             (eicr & IXGBE_EICR_GPI_SDP1)) {
-                DPRINTK(PROBE, CRIT, "Fan has stopped, replace the adapter\n");
+                e_crit("Fan has stopped, replace the adapter\n");
                 /* write to clear the interrupt */
                 IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1);
         }
@@ -2154,9 +2153,8 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
                                   handler, 0, adapter->name[vector],
                                   adapter->q_vector[vector]);
                 if (err) {
-                        DPRINTK(PROBE, ERR,
-                                "request_irq failed for MSIX interrupt "
-                                "Error: %d\n", err);
+                        e_err("request_irq failed for MSIX interrupt: "
+                              "Error: %d\n", err);
                         goto free_queue_irqs;
                 }
         }
@@ -2165,8 +2163,7 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
         err = request_irq(adapter->msix_entries[vector].vector,
                           ixgbe_msix_lsc, 0, adapter->name[vector], netdev);
         if (err) {
-                DPRINTK(PROBE, ERR,
-                        "request_irq for msix_lsc failed: %d\n", err);
+                e_err("request_irq for msix_lsc failed: %d\n", err);
                 goto free_queue_irqs;
         }
 
@@ -2352,7 +2349,7 @@ static int ixgbe_request_irq(struct ixgbe_adapter *adapter)
         }
 
         if (err)
-                DPRINTK(PROBE, ERR, "request_irq failed, Error %d\n", err);
+                e_err("request_irq failed, Error %d\n", err);
 
         return err;
 }
@@ -2423,7 +2420,7 @@ static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)
         map_vector_to_rxq(adapter, 0, 0);
         map_vector_to_txq(adapter, 0, 0);
 
-        DPRINTK(HW, INFO, "Legacy interrupt IVAR setup done\n");
+        e_info("Legacy interrupt IVAR setup done\n");
 }
 
 /**
@@ -2995,6 +2992,48 @@ static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
 }
 
 /**
+ * ixgbe_write_uc_addr_list - write unicast addresses to RAR table
+ * @netdev: network interface device structure
+ *
+ * Writes unicast address list to the RAR table.
+ * Returns: -ENOMEM on failure/insufficient address space
+ *                0 on no addresses written
+ *                X on writing X addresses to the RAR table
+ **/
+static int ixgbe_write_uc_addr_list(struct net_device *netdev)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        struct ixgbe_hw *hw = &adapter->hw;
+        unsigned int vfn = adapter->num_vfs;
+        unsigned int rar_entries = hw->mac.num_rar_entries - (vfn + 1);
+        int count = 0;
+
+        /* return ENOMEM indicating insufficient memory for addresses */
+        if (netdev_uc_count(netdev) > rar_entries)
+                return -ENOMEM;
+
+        if (!netdev_uc_empty(netdev) && rar_entries) {
+                struct netdev_hw_addr *ha;
+                /* return error if we do not support writing to RAR table */
+                if (!hw->mac.ops.set_rar)
+                        return -ENOMEM;
+
+                netdev_for_each_uc_addr(ha, netdev) {
+                        if (!rar_entries)
+                                break;
+                        hw->mac.ops.set_rar(hw, rar_entries--, ha->addr,
+                                            vfn, IXGBE_RAH_AV);
+                        count++;
+                }
+        }
+        /* write the addresses in reverse order to avoid write combining */
+        for (; rar_entries > 0 ; rar_entries--)
+                hw->mac.ops.clear_rar(hw, rar_entries);
+
+        return count;
+}
+
+/**
  * ixgbe_set_rx_mode - Unicast, Multicast and Promiscuous mode set
  * @netdev: network interface device structure
  *
@@ -3007,38 +3046,58 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
-        u32 fctrl;
+        u32 fctrl, vmolr = IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE;
+        int count;
 
         /* Check for Promiscuous and All Multicast modes */
 
         fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
 
+        /* clear the bits we are changing the status of */
+        fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+
         if (netdev->flags & IFF_PROMISC) {
                 hw->addr_ctrl.user_set_promisc = true;
                 fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+                vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_MPE);
                 /* don't hardware filter vlans in promisc mode */
                 ixgbe_vlan_filter_disable(adapter);
         } else {
                 if (netdev->flags & IFF_ALLMULTI) {
                         fctrl |= IXGBE_FCTRL_MPE;
-                        fctrl &= ~IXGBE_FCTRL_UPE;
-                } else if (!hw->addr_ctrl.uc_set_promisc) {
-                        fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+                        vmolr |= IXGBE_VMOLR_MPE;
+                } else {
+                        /*
+                         * Write addresses to the MTA, if the attempt fails
+                         * then we should just turn on promiscous mode so
+                         * that we can at least receive multicast traffic
+                         */
+                        hw->mac.ops.update_mc_addr_list(hw, netdev);
+                        vmolr |= IXGBE_VMOLR_ROMPE;
                 }
                 ixgbe_vlan_filter_enable(adapter);
                 hw->addr_ctrl.user_set_promisc = false;
+                /*
+                 * Write addresses to available RAR registers, if there is not
+                 * sufficient space to store all the addresses then enable
+                 * unicast promiscous mode
+                 */
+                count = ixgbe_write_uc_addr_list(netdev);
+                if (count < 0) {
+                        fctrl |= IXGBE_FCTRL_UPE;
+                        vmolr |= IXGBE_VMOLR_ROPE;
+                }
         }
 
-        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
-
-        /* reprogram secondary unicast list */
-        hw->mac.ops.update_uc_addr_list(hw, netdev);
-
-        /* reprogram multicast list */
-        hw->mac.ops.update_mc_addr_list(hw, netdev);
-
-        if (adapter->num_vfs)
+        if (adapter->num_vfs) {
                 ixgbe_restore_vf_multicasts(adapter);
+                vmolr |= IXGBE_READ_REG(hw, IXGBE_VMOLR(adapter->num_vfs)) &
+                         ~(IXGBE_VMOLR_MPE | IXGBE_VMOLR_ROMPE |
+                           IXGBE_VMOLR_ROPE);
+                IXGBE_WRITE_REG(hw, IXGBE_VMOLR(adapter->num_vfs), vmolr);
+        }
+
+        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
 }
 
 static void ixgbe_napi_enable_all(struct ixgbe_adapter *adapter)
@@ -3257,8 +3316,8 @@ static inline void ixgbe_rx_desc_queue_enable(struct ixgbe_adapter *adapter,
                         msleep(1);
         }
         if (k >= IXGBE_MAX_RX_DESC_POLL) {
-                DPRINTK(DRV, ERR, "RXDCTL.ENABLE on Rx queue %d "
-                        "not set within the polling period\n", rxr);
+                e_err("RXDCTL.ENABLE on Rx queue %d not set within "
+                      "the polling period\n", rxr);
         }
         ixgbe_release_rx_desc(&adapter->hw, adapter->rx_ring[rxr],
                               (adapter->rx_ring[rxr]->count - 1));
@@ -3387,8 +3446,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
                         } while (--wait_loop &&
                                  !(txdctl & IXGBE_TXDCTL_ENABLE));
                         if (!wait_loop)
-                                DPRINTK(DRV, ERR, "Could not enable "
-                                        "Tx Queue %d\n", j);
+                                e_err("Could not enable Tx Queue %d\n", j);
                 }
         }
 
@@ -3436,8 +3494,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
         if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
                 u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
                 if (esdp & IXGBE_ESDP_SDP1)
-                        DPRINTK(DRV, CRIT,
-                                "Fan has stopped, replace the adapter\n");
+                        e_crit("Fan has stopped, replace the adapter\n");
         }
 
         /*
@@ -3466,7 +3523,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
         } else {
                 err = ixgbe_non_sfp_link_config(hw);
                 if (err)
-                        DPRINTK(PROBE, ERR, "link_config FAILED %d\n", err);
+                        e_err("link_config FAILED %d\n", err);
         }
 
         for (i = 0; i < adapter->num_tx_queues; i++)
@@ -3527,19 +3584,19 @@ void ixgbe_reset(struct ixgbe_adapter *adapter)
         case IXGBE_ERR_SFP_NOT_PRESENT:
                 break;
         case IXGBE_ERR_MASTER_REQUESTS_PENDING:
-                dev_err(&adapter->pdev->dev, "master disable timed out\n");
+                e_dev_err("master disable timed out\n");
                 break;
         case IXGBE_ERR_EEPROM_VERSION:
                 /* We are running on a pre-production device, log a warning */
-                dev_warn(&adapter->pdev->dev, "This device is a pre-production "
-                         "adapter/LOM.  Please be aware there may be issues "
-                         "associated with your hardware.  If you are "
-                         "experiencing problems please contact your Intel or "
-                         "hardware representative who provided you with this "
-                         "hardware.\n");
+                e_dev_warn("This device is a pre-production adapter/LOM. "
+                           "Please be aware there may be issuesassociated with "
+                           "your hardware.  If you are experiencing problems "
+                           "please contact your Intel or hardware "
+                           "representative who provided you with this "
+                           "hardware.\n");
                 break;
         default:
-                dev_err(&adapter->pdev->dev, "Hardware Error: %d\n", err);
+                e_dev_err("Hardware Error: %d\n", err);
         }
 
         /* reprogram the RAR[0] in case user changed it. */
@@ -3920,12 +3977,12 @@ static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
                 adapter->num_tx_queues = 1;
 #ifdef CONFIG_IXGBE_DCB
                 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        DPRINTK(PROBE, INFO, "FCoE enabled with DCB\n");
+                        e_info("FCoE enabled with DCB\n");
                         ixgbe_set_dcb_queues(adapter);
                 }
 #endif
                 if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
-                        DPRINTK(PROBE, INFO, "FCoE enabled with RSS\n");
+                        e_info("FCoE enabled with RSS\n");
                         if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) ||
                             (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
                                 ixgbe_set_fdir_queues(adapter);
@@ -4038,7 +4095,8 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
                  * This just means we'll go with either a single MSI
                  * vector or fall back to legacy interrupts.
                  */
-                DPRINTK(HW, DEBUG, "Unable to allocate MSI-X interrupts\n");
+                netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
+                             "Unable to allocate MSI-X interrupts\n");
                 adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
                 kfree(adapter->msix_entries);
                 adapter->msix_entries = NULL;
@@ -4435,8 +4493,9 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
         if (!err) {
                 adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
         } else {
-                DPRINTK(HW, DEBUG, "Unable to allocate MSI interrupt, "
-                        "falling back to legacy.  Error: %d\n", err);
+                netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
+                             "Unable to allocate MSI interrupt, "
+                             "falling back to legacy.  Error: %d\n", err);
                 /* reset err */
                 err = 0;
         }
@@ -4557,27 +4616,25 @@ int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)
 
         err = ixgbe_set_interrupt_capability(adapter);
         if (err) {
-                DPRINTK(PROBE, ERR, "Unable to setup interrupt capabilities\n");
+                e_dev_err("Unable to setup interrupt capabilities\n");
                 goto err_set_interrupt;
         }
 
         err = ixgbe_alloc_q_vectors(adapter);
         if (err) {
-                DPRINTK(PROBE, ERR, "Unable to allocate memory for queue "
-                        "vectors\n");
+                e_dev_err("Unable to allocate memory for queue vectors\n");
                 goto err_alloc_q_vectors;
         }
 
         err = ixgbe_alloc_queues(adapter);
         if (err) {
-                DPRINTK(PROBE, ERR, "Unable to allocate memory for queues\n");
+                e_dev_err("Unable to allocate memory for queues\n");
                 goto err_alloc_queues;
         }
 
-        DPRINTK(DRV, INFO, "Multiqueue %s: Rx Queue count = %u, "
-                "Tx Queue count = %u\n",
-                (adapter->num_rx_queues > 1) ? "Enabled" :
-                "Disabled", adapter->num_rx_queues, adapter->num_tx_queues);
+        e_dev_info("Multiqueue %s: Rx Queue count = %u, Tx Queue count = %u\n",
+               (adapter->num_rx_queues > 1) ? "Enabled" : "Disabled",
+               adapter->num_rx_queues, adapter->num_tx_queues);
 
         set_bit(__IXGBE_DOWN, &adapter->state);
 
@@ -4648,15 +4705,13 @@ static void ixgbe_sfp_task(struct work_struct *work)
                         goto reschedule;
                 ret = hw->phy.ops.reset(hw);
                 if (ret == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-                        dev_err(&adapter->pdev->dev, "failed to initialize "
-                                "because an unsupported SFP+ module type "
-                                "was detected.\n"
-                                "Reload the driver after installing a "
-                                "supported module.\n");
+                        e_dev_err("failed to initialize because an unsupported "
+                                  "SFP+ module type was detected.\n");
+                        e_dev_err("Reload the driver after installing a "
+                                  "supported module.\n");
                         unregister_netdev(adapter->netdev);
                 } else {
-                        DPRINTK(PROBE, INFO, "detected SFP+: %d\n",
-                                hw->phy.sfp_type);
+                        e_info("detected SFP+: %d\n", hw->phy.sfp_type);
                 }
                 /* don't need this routine any more */
                 clear_bit(__IXGBE_SFP_MODULE_NOT_FOUND, &adapter->state);
@@ -4783,7 +4838,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
 
         /* initialize eeprom parameters */
         if (ixgbe_init_eeprom_params_generic(hw)) {
-                dev_err(&pdev->dev, "EEPROM initialization failed\n");
+                e_dev_err("EEPROM initialization failed\n");
                 return -EIO;
         }
 
@@ -4836,8 +4891,7 @@ int ixgbe_setup_tx_resources(struct ixgbe_adapter *adapter,
 err:
         vfree(tx_ring->tx_buffer_info);
         tx_ring->tx_buffer_info = NULL;
-        DPRINTK(PROBE, ERR, "Unable to allocate memory for the transmit "
-                            "descriptor ring\n");
+        e_err("Unable to allocate memory for the Tx descriptor ring\n");
         return -ENOMEM;
 }
 
@@ -4859,7 +4913,7 @@ static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)
                 err = ixgbe_setup_tx_resources(adapter, adapter->tx_ring[i]);
                 if (!err)
                         continue;
-                DPRINTK(PROBE, ERR, "Allocation for Tx Queue %u failed\n", i);
+                e_err("Allocation for Tx Queue %u failed\n", i);
                 break;
         }
 
@@ -4884,8 +4938,7 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
         if (!rx_ring->rx_buffer_info)
                 rx_ring->rx_buffer_info = vmalloc(size);
         if (!rx_ring->rx_buffer_info) {
-                DPRINTK(PROBE, ERR,
-                        "vmalloc allocation failed for the rx desc ring\n");
+                e_err("vmalloc allocation failed for the Rx desc ring\n");
                 goto alloc_failed;
         }
         memset(rx_ring->rx_buffer_info, 0, size);
@@ -4898,8 +4951,7 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
                                            &rx_ring->dma, GFP_KERNEL);
 
         if (!rx_ring->desc) {
-                DPRINTK(PROBE, ERR,
-                        "Memory allocation failed for the rx desc ring\n");
+                e_err("Memory allocation failed for the Rx desc ring\n");
                 vfree(rx_ring->rx_buffer_info);
                 goto alloc_failed;
         }
@@ -4932,7 +4984,7 @@ static int ixgbe_setup_all_rx_resources(struct ixgbe_adapter *adapter)
                 err = ixgbe_setup_rx_resources(adapter, adapter->rx_ring[i]);
                 if (!err)
                         continue;
-                DPRINTK(PROBE, ERR, "Allocation for Rx Queue %u failed\n", i);
+                e_err("Allocation for Rx Queue %u failed\n", i);
                 break;
         }
 
@@ -5031,8 +5083,7 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
         if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
                 return -EINVAL;
 
-        DPRINTK(PROBE, INFO, "changing MTU from %d to %d\n",
-                netdev->mtu, new_mtu);
+        e_info("changing MTU from %d to %d\n", netdev->mtu, new_mtu);
         /* must set new MTU before calling down or up */
         netdev->mtu = new_mtu;
 
@@ -5145,8 +5196,7 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
         err = pci_enable_device_mem(pdev);
         if (err) {
-                printk(KERN_ERR "ixgbe: Cannot enable PCI device from "
-                                "suspend\n");
+                e_dev_err("Cannot enable PCI device from suspend\n");
                 return err;
         }
         pci_set_master(pdev);
@@ -5155,8 +5205,7 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
         err = ixgbe_init_interrupt_scheme(adapter);
         if (err) {
-                printk(KERN_ERR "ixgbe: Cannot initialize interrupts for "
-                                "device\n");
+                e_dev_err("Cannot initialize interrupts for device\n");
                 return err;
         }
 
@@ -5282,6 +5331,10 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
         u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
         u64 non_eop_descs = 0, restart_queue = 0;
 
+        if (test_bit(__IXGBE_DOWN, &adapter->state) ||
+            test_bit(__IXGBE_RESETTING, &adapter->state))
+                return;
+
         if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                 u64 rsc_count = 0;
                 u64 rsc_flush = 0;
@@ -5512,10 +5565,10 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
         err = hw->phy.ops.identify_sfp(hw);
 
         if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-                dev_err(&adapter->pdev->dev, "failed to initialize because "
-                        "an unsupported SFP+ module type was detected.\n"
-                        "Reload the driver after installing a supported "
-                        "module.\n");
+                e_dev_err("failed to initialize because an unsupported SFP+ "
+                          "module type was detected.\n");
+                e_dev_err("Reload the driver after installing a supported "
+                          "module.\n");
                 unregister_netdev(adapter->netdev);
                 return;
         }
@@ -5544,8 +5597,8 @@ static void ixgbe_fdir_reinit_task(struct work_struct *work)
                         set_bit(__IXGBE_FDIR_INIT_DONE,
                                 &(adapter->tx_ring[i]->reinit_state));
         } else {
-                DPRINTK(PROBE, ERR, "failed to finish FDIR re-initialization, "
-                        "ignored adding FDIR ATR filters\n");
+                e_err("failed to finish FDIR re-initialization, "
+                      "ignored adding FDIR ATR filters\n");
         }
         /* Done FDIR Re-initialization, enable transmits */
         netif_tx_start_all_queues(adapter->netdev);
@@ -5616,16 +5669,14 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                                 flow_tx = !!(rmcs & IXGBE_RMCS_TFCE_802_3X);
                         }
 
-                        printk(KERN_INFO "ixgbe: %s NIC Link is Up %s, "
-                               "Flow Control: %s\n",
-                               netdev->name,
+                        e_info("NIC Link is Up %s, Flow Control: %s\n",
                                (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
-                                "10 Gbps" :
-                                (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-                                 "1 Gbps" : "unknown speed")),
+                               "10 Gbps" :
+                               (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
+                               "1 Gbps" : "unknown speed")),
                                ((flow_rx && flow_tx) ? "RX/TX" :
-                                (flow_rx ? "RX" :
-                                (flow_tx ? "TX" : "None"))));
+                               (flow_rx ? "RX" :
+                               (flow_tx ? "TX" : "None"))));
 
                         netif_carrier_on(netdev);
                 } else {
@@ -5636,8 +5687,7 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                 adapter->link_up = false;
                 adapter->link_speed = 0;
                 if (netif_carrier_ok(netdev)) {
-                        printk(KERN_INFO "ixgbe: %s NIC Link is Down\n",
-                               netdev->name);
+                        e_info("NIC Link is Down\n");
                         netif_carrier_off(netdev);
                 }
         }
@@ -5813,9 +5863,8 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
                                 break;
                         default:
                                 if (unlikely(net_ratelimit())) {
-                                        DPRINTK(PROBE, WARNING,
-                                         "partial checksum but proto=%x!\n",
-                                         skb->protocol);
+                                        e_warn("partial checksum but "
+                                               "proto=%x!\n", skb->protocol);
                                 }
                                 break;
                         }
@@ -5926,7 +5975,7 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,
         return count;
 
 dma_error:
-        dev_err(&pdev->dev, "TX DMA map failed\n");
+        e_dev_err("TX DMA map failed\n");
 
         /* clear timestamp and dma mappings for failed tx_buffer_info map */
         tx_buffer_info->dma = 0;
@@ -6423,8 +6472,7 @@ static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
         adapter->flags |= IXGBE_FLAG_SRIOV_ENABLED;
         err = pci_enable_sriov(adapter->pdev, adapter->num_vfs);
         if (err) {
-                DPRINTK(PROBE, ERR,
-                        "Failed to enable PCI sriov: %d\n", err);
+                e_err("Failed to enable PCI sriov: %d\n", err);
                 goto err_novfs;
         }
         /* If call to enable VFs succeeded then allocate memory
@@ -6448,9 +6496,8 @@ static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
         }
 
         /* Oh oh */
-        DPRINTK(PROBE, ERR,
-                "Unable to allocate memory for VF "
-                "Data Storage - SRIOV disabled\n");
+        e_err("Unable to allocate memory for VF Data Storage - SRIOV "
+              "disabled\n");
         pci_disable_sriov(adapter->pdev);
 
 err_novfs:
@@ -6498,8 +6545,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                         err = dma_set_coherent_mask(&pdev->dev,
                                                     DMA_BIT_MASK(32));
                         if (err) {
-                                dev_err(&pdev->dev, "No usable DMA "
-                                        "configuration, aborting\n");
+                                e_dev_err("No usable DMA configuration, "
+                                          "aborting\n");
                                 goto err_dma;
                         }
                 }
@@ -6509,8 +6556,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
                                            IORESOURCE_MEM), ixgbe_driver_name);
         if (err) {
-                dev_err(&pdev->dev,
-                        "pci_request_selected_regions failed 0x%x\n", err);
+                e_dev_err("pci_request_selected_regions failed 0x%x\n", err);
                 goto err_pci_reg;
         }
 
@@ -6621,8 +6667,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
                 u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
                 if (esdp & IXGBE_ESDP_SDP1)
-                        DPRINTK(PROBE, CRIT,
-                                "Fan has stopped, replace the adapter\n");
+                        e_crit("Fan has stopped, replace the adapter\n");
         }
 
         /* reset_hw fills in the perm_addr as well */
@@ -6641,19 +6686,19 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                           round_jiffies(jiffies + (2 * HZ)));
                 err = 0;
         } else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-                dev_err(&adapter->pdev->dev, "failed to initialize because "
-                        "an unsupported SFP+ module type was detected.\n"
-                        "Reload the driver after installing a supported "
-                        "module.\n");
+                e_dev_err("failed to initialize because an unsupported SFP+ "
+                          "module type was detected.\n");
+                e_dev_err("Reload the driver after installing a supported "
+                          "module.\n");
                 goto err_sw_init;
         } else if (err) {
-                dev_err(&adapter->pdev->dev, "HW Init failed: %d\n", err);
+                e_dev_err("HW Init failed: %d\n", err);
                 goto err_sw_init;
         }
 
         ixgbe_probe_vf(adapter, ii);
 
-        netdev->features = NETIF_F_SG |
+        netdev->features =    NETIF_F_SG |
                            NETIF_F_IP_CSUM |
                            NETIF_F_HW_VLAN_TX |
                            NETIF_F_HW_VLAN_RX |
@@ -6700,7 +6745,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         /* make sure the EEPROM is good */
         if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) {
-                dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n");
+                e_dev_err("The EEPROM Checksum Is Not Valid\n");
                 err = -EIO;
                 goto err_eeprom;
         }
@@ -6709,7 +6754,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len);
 
         if (ixgbe_validate_mac_addr(netdev->perm_addr)) {
-                dev_err(&pdev->dev, "invalid MAC address\n");
+                e_dev_err("invalid MAC address\n");
                 err = -EIO;
                 goto err_eeprom;
         }
@@ -6744,7 +6789,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         hw->mac.ops.get_bus_info(hw);
 
         /* print bus type/speed/width info */
-        dev_info(&pdev->dev, "(PCI Express:%s:%s) %pM\n",
+        e_dev_info("(PCI Express:%s:%s) %pM\n",
                 ((hw->bus.speed == ixgbe_bus_speed_5000) ? "5.0Gb/s":
                  (hw->bus.speed == ixgbe_bus_speed_2500) ? "2.5Gb/s":"Unknown"),
                 ((hw->bus.width == ixgbe_bus_width_pcie_x8) ? "Width x8" :
@@ -6754,20 +6799,20 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                 netdev->dev_addr);
         ixgbe_read_pba_num_generic(hw, &part_num);
         if (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)
-                dev_info(&pdev->dev, "MAC: %d, PHY: %d, SFP+: %d, PBA No: %06x-%03x\n",
-                         hw->mac.type, hw->phy.type, hw->phy.sfp_type,
-                         (part_num >> 8), (part_num & 0xff));
+                e_dev_info("MAC: %d, PHY: %d, SFP+: %d, "
+                           "PBA No: %06x-%03x\n",
+                           hw->mac.type, hw->phy.type, hw->phy.sfp_type,
+                           (part_num >> 8), (part_num & 0xff));
         else
-                dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
-                         hw->mac.type, hw->phy.type,
-                         (part_num >> 8), (part_num & 0xff));
+                e_dev_info("MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
+                           hw->mac.type, hw->phy.type,
+                           (part_num >> 8), (part_num & 0xff));
 
         if (hw->bus.width <= ixgbe_bus_width_pcie_x4) {
-                dev_warn(&pdev->dev, "PCI-Express bandwidth available for "
-                         "this card is not sufficient for optimal "
-                         "performance.\n");
-                dev_warn(&pdev->dev, "For optimal performance a x8 "
-                         "PCI-Express slot is required.\n");
+                e_dev_warn("PCI-Express bandwidth available for this card is "
+                           "not sufficient for optimal performance.\n");
+                e_dev_warn("For optimal performance a x8 PCI-Express slot "
+                           "is required.\n");
         }
 
         /* save off EEPROM version number */
@@ -6778,12 +6823,12 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         if (err == IXGBE_ERR_EEPROM_VERSION) {
                 /* We are running on a pre-production device, log a warning */
-                dev_warn(&pdev->dev, "This device is a pre-production "
-                         "adapter/LOM.  Please be aware there may be issues "
-                         "associated with your hardware.  If you are "
-                         "experiencing problems please contact your Intel or "
-                         "hardware representative who provided you with this "
-                         "hardware.\n");
+                e_dev_warn("This device is a pre-production adapter/LOM. "
+                           "Please be aware there may be issues associated "
+                           "with your hardware.  If you are experiencing "
+                           "problems please contact your Intel or hardware "
+                           "representative who provided you with this "
+                           "hardware.\n");
         }
         strcpy(netdev->name, "eth%d");
         err = register_netdev(netdev);
@@ -6806,8 +6851,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         }
 #endif
         if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
-                DPRINTK(PROBE, INFO, "IOV is enabled with %d VFs\n",
-                        adapter->num_vfs);
+                e_info("IOV is enabled with %d VFs\n", adapter->num_vfs);
                 for (i = 0; i < adapter->num_vfs; i++)
                         ixgbe_vf_configuration(pdev, (i | 0x10000000));
         }
@@ -6815,7 +6859,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         /* add san mac addr to netdev */
         ixgbe_add_sanmac_netdev(netdev);
 
-        dev_info(&pdev->dev, "Intel(R) 10 Gigabit Network Connection\n");
+        e_dev_info("Intel(R) 10 Gigabit Network Connection\n");
         cards_found++;
         return 0;
 
@@ -6905,7 +6949,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
         pci_release_selected_regions(pdev, pci_select_bars(pdev,
                                      IORESOURCE_MEM));
 
-        DPRINTK(PROBE, INFO, "complete\n");
+        e_dev_info("complete\n");
 
         free_netdev(netdev);
 
@@ -6955,8 +6999,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
         int err;
 
         if (pci_enable_device_mem(pdev)) {
-                DPRINTK(PROBE, ERR,
-                        "Cannot re-enable PCI device after reset.\n");
+                e_err("Cannot re-enable PCI device after reset.\n");
                 result = PCI_ERS_RESULT_DISCONNECT;
         } else {
                 pci_set_master(pdev);
@@ -6972,8 +7015,8 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
 
         err = pci_cleanup_aer_uncorrect_error_status(pdev);
         if (err) {
-                dev_err(&pdev->dev,
-                  "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n", err);
+                e_dev_err("pci_cleanup_aer_uncorrect_error_status "
+                          "failed 0x%0x\n", err);
                 /* non-fatal, continue */
         }
 
@@ -6994,7 +7037,7 @@ static void ixgbe_io_resume(struct pci_dev *pdev)
 
         if (netif_running(netdev)) {
                 if (ixgbe_up(adapter)) {
-                        DPRINTK(PROBE, INFO, "ixgbe_up failed after reset\n");
+                        e_info("ixgbe_up failed after reset\n");
                         return;
                 }
         }
@@ -7030,10 +7073,9 @@ static struct pci_driver ixgbe_driver = {
 static int __init ixgbe_init_module(void)
 {
         int ret;
-        printk(KERN_INFO "%s: %s - version %s\n", ixgbe_driver_name,
-               ixgbe_driver_string, ixgbe_driver_version);
-
-        printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright);
+        pr_info("%s - version %s\n", ixgbe_driver_string,
+                   ixgbe_driver_version);
+        pr_info("%s\n", ixgbe_copyright);
 
 #ifdef CONFIG_IXGBE_DCA
         dca_register_notify(&dca_notifier);
@@ -7072,18 +7114,17 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
 }
 
 #endif /* CONFIG_IXGBE_DCA */
-#ifdef DEBUG
+
 /**
- * ixgbe_get_hw_dev_name - return device name string
+ * ixgbe_get_hw_dev return device
  * used by hardware layer to print debugging information
  **/
-char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw)
+struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw)
 {
         struct ixgbe_adapter *adapter = hw->back;
-        return adapter->netdev->name;
+        return adapter->netdev;
 }
 
-#endif
 module_exit(ixgbe_exit_module);
 
 /* ixgbe_main.c */
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index f6cee94ec8e..6e6dee04ff6 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -25,7 +25,6 @@
 
 *******************************************************************************/
 
-
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -138,6 +137,7 @@ static void ixgbe_set_vmvir(struct ixgbe_adapter *adapter, u32 vid, u32 vf)
 inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
 {
         struct ixgbe_hw *hw = &adapter->hw;
+        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
 
         /* reset offloads to defaults */
         if (adapter->vfinfo[vf].pf_vlan) {
@@ -159,26 +159,17 @@ inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
         /* Flush and reset the mta with the new values */
         ixgbe_set_rx_mode(adapter->netdev);
 
-        if (adapter->vfinfo[vf].rar > 0) {
-                adapter->hw.mac.ops.clear_rar(&adapter->hw,
-                                              adapter->vfinfo[vf].rar);
-                adapter->vfinfo[vf].rar = -1;
-        }
+        hw->mac.ops.clear_rar(hw, rar_entry);
 }
 
 int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
                           int vf, unsigned char *mac_addr)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-
-        adapter->vfinfo[vf].rar = hw->mac.ops.set_rar(hw, vf + 1, mac_addr,
-                                                      vf, IXGBE_RAH_AV);
-        if (adapter->vfinfo[vf].rar < 0) {
-                DPRINTK(DRV, ERR, "Could not set MAC Filter for VF %d\n", vf);
-                return -1;
-        }
+        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
 
         memcpy(adapter->vfinfo[vf].vf_mac_addresses, mac_addr, 6);
+        hw->mac.ops.set_rar(hw, rar_entry, mac_addr, vf, IXGBE_RAH_AV);
 
         return 0;
 }
@@ -194,11 +185,7 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
 
         if (enable) {
                 random_ether_addr(vf_mac_addr);
-                DPRINTK(PROBE, INFO, "IOV: VF %d is enabled "
-                       "mac %02X:%02X:%02X:%02X:%02X:%02X\n",
-                       vfn,
-                       vf_mac_addr[0], vf_mac_addr[1], vf_mac_addr[2],
-                       vf_mac_addr[3], vf_mac_addr[4], vf_mac_addr[5]);
+                e_info("IOV: VF %d is enabled MAC %pM\n", vfn, vf_mac_addr);
                 /*
                  * Store away the VF "permananet" MAC address, it will ask
                  * for it later.
@@ -243,7 +230,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
         retval = ixgbe_read_mbx(hw, msgbuf, mbx_size, vf);
 
         if (retval)
-                printk(KERN_ERR "Error receiving message from VF\n");
+                pr_err("Error receiving message from VF\n");
 
         /* this is a message we already processed, do nothing */
         if (msgbuf[0] & (IXGBE_VT_MSGTYPE_ACK | IXGBE_VT_MSGTYPE_NACK))
@@ -257,7 +244,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
         if (msgbuf[0] == IXGBE_VF_RESET) {
                 unsigned char *vf_mac = adapter->vfinfo[vf].vf_mac_addresses;
                 u8 *addr = (u8 *)(&msgbuf[1]);
-                DPRINTK(PROBE, INFO, "VF Reset msg received from vf %d\n", vf);
+                e_info("VF Reset msg received from vf %d\n", vf);
                 adapter->vfinfo[vf].clear_to_send = false;
                 ixgbe_vf_reset_msg(adapter, vf);
                 adapter->vfinfo[vf].clear_to_send = true;
@@ -310,7 +297,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
                 retval = ixgbe_set_vf_vlan(adapter, add, vid, vf);
                 break;
         default:
-                DPRINTK(DRV, ERR, "Unhandled Msg %8.8x\n", msgbuf[0]);
+                e_err("Unhandled Msg %8.8x\n", msgbuf[0]);
                 retval = IXGBE_ERR_MBX;
                 break;
         }
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 2eb6e151016..cdd1998f18c 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -2609,6 +2609,7 @@ struct ixgbe_info {
 #define IXGBE_ERR_EEPROM_VERSION                -24
 #define IXGBE_ERR_NO_SPACE                      -25
 #define IXGBE_ERR_OVERTEMP                      -26
+#define IXGBE_ERR_RAR_INDEX                     -27
 #define IXGBE_NOT_IMPLEMENTED                   0x7FFFFFFF
 
 #endif /* _IXGBE_TYPE_H_ */
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index a16cff7e54a..73f1e75f68d 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -3411,6 +3411,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
         netdev->features |= NETIF_F_IPV6_CSUM;
         netdev->features |= NETIF_F_TSO;
         netdev->features |= NETIF_F_TSO6;
+        netdev->features |= NETIF_F_GRO;
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;
         netdev->vlan_features |= NETIF_F_IP_CSUM;
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index 26bf1b76b99..c7a9bef4dfb 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -135,6 +135,7 @@ struct korina_private {
         struct napi_struct napi;
         struct timer_list media_check_timer;
         struct mii_if_info mii_if;
+        struct work_struct restart_task;
         struct net_device *dev;
         int phy_addr;
 };
@@ -375,7 +376,7 @@ static int korina_rx(struct net_device *dev, int limit)
                 if (devcs & ETH_RX_LE)
                         dev->stats.rx_length_errors++;
                 if (devcs & ETH_RX_OVR)
-                        dev->stats.rx_over_errors++;
+                        dev->stats.rx_fifo_errors++;
                 if (devcs & ETH_RX_CV)
                         dev->stats.rx_frame_errors++;
                 if (devcs & ETH_RX_CES)
@@ -764,10 +765,9 @@ static int korina_alloc_ring(struct net_device *dev)
 
         /* Initialize the receive descriptors */
         for (i = 0; i < KORINA_NUM_RDS; i++) {
-                skb = dev_alloc_skb(KORINA_RBSIZE + 2);
+                skb = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE);
                 if (!skb)
                         return -ENOMEM;
-                skb_reserve(skb, 2);
                 lp->rx_skb[i] = skb;
                 lp->rd_ring[i].control = DMA_DESC_IOD |
                                 DMA_COUNT(KORINA_RBSIZE);
@@ -890,12 +890,12 @@ static int korina_init(struct net_device *dev)
 
 /*
  * Restart the RC32434 ethernet controller.
- * FIXME: check the return status where we call it
  */
-static int korina_restart(struct net_device *dev)
+static void korina_restart_task(struct work_struct *work)
 {
-        struct korina_private *lp = netdev_priv(dev);
-        int ret;
+        struct korina_private *lp = container_of(work,
+                        struct korina_private, restart_task);
+        struct net_device *dev = lp->dev;
 
         /*
          * Disable interrupts
@@ -916,10 +916,9 @@ static int korina_restart(struct net_device *dev)
 
         napi_disable(&lp->napi);
 
-        ret = korina_init(dev);
-        if (ret < 0) {
+        if (korina_init(dev) < 0) {
                 printk(KERN_ERR "%s: cannot restart device\n", dev->name);
-                return ret;
+                return;
         }
         korina_multicast_list(dev);
 
@@ -927,8 +926,6 @@ static int korina_restart(struct net_device *dev)
         enable_irq(lp->ovr_irq);
         enable_irq(lp->tx_irq);
         enable_irq(lp->rx_irq);
-
-        return ret;
 }
 
 static void korina_clear_and_restart(struct net_device *dev, u32 value)
@@ -937,7 +934,7 @@ static void korina_clear_and_restart(struct net_device *dev, u32 value)
 
         netif_stop_queue(dev);
         writel(value, &lp->eth_regs->ethintfc);
-        korina_restart(dev);
+        schedule_work(&lp->restart_task);
 }
 
 /* Ethernet Tx Underflow interrupt */
@@ -962,11 +959,8 @@ static irqreturn_t korina_und_interrupt(int irq, void *dev_id)
 static void korina_tx_timeout(struct net_device *dev)
 {
         struct korina_private *lp = netdev_priv(dev);
-        unsigned long flags;
 
-        spin_lock_irqsave(&lp->lock, flags);
-        korina_restart(dev);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        schedule_work(&lp->restart_task);
 }
 
 /* Ethernet Rx Overflow interrupt */
@@ -1086,6 +1080,8 @@ static int korina_close(struct net_device *dev)
 
         napi_disable(&lp->napi);
 
+        cancel_work_sync(&lp->restart_task);
+
         free_irq(lp->rx_irq, dev);
         free_irq(lp->tx_irq, dev);
         free_irq(lp->ovr_irq, dev);
@@ -1198,6 +1194,8 @@ static int korina_probe(struct platform_device *pdev)
         }
         setup_timer(&lp->media_check_timer, korina_poll_media, (unsigned long) dev);
 
+        INIT_WORK(&lp->restart_task, korina_restart_task);
+
         printk(KERN_INFO "%s: " DRV_NAME "-" DRV_VERSION " " DRV_RELDATE "\n",
                         dev->name);
 out:
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index c80ca64277b..62362b4a8c5 100644
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -4854,7 +4854,7 @@ static inline void copy_old_skb(struct sk_buff *old, struct sk_buff *skb)
  *
  * Return 0 if successful; otherwise an error code indicating failure.
  */
-static int netdev_tx(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)
 {
         struct dev_priv *priv = netdev_priv(dev);
         struct dev_info *hw_priv = priv->adapter;
@@ -5718,7 +5718,7 @@ static void dev_set_promiscuous(struct net_device *dev, struct dev_priv *priv,
                  * from the bridge.
                  */
                 if ((hw->features & STP_SUPPORT) && !promiscuous &&
-                                dev->br_port) {
+                    (dev->priv_flags & IFF_BRIDGE_PORT)) {
                         struct ksz_switch *sw = hw->ksz_switch;
                         int port = priv->port.first_port;
 
@@ -6863,6 +6863,7 @@ static const struct net_device_ops netdev_ops = {
         .ndo_tx_timeout         = netdev_tx_timeout,
         .ndo_change_mtu         = netdev_change_mtu,
         .ndo_set_mac_address    = netdev_set_mac_address,
+        .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = netdev_ioctl,
         .ndo_set_rx_mode        = netdev_set_rx_mode,
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ll_temac.h b/drivers/net/ll_temac.h
index c03358434ac..522abe2ff25 100644
--- a/drivers/net/ll_temac.h
+++ b/drivers/net/ll_temac.h
@@ -295,6 +295,10 @@ This option defaults to enabled (set) */
 
 #define MULTICAST_CAM_TABLE_NUM 4
 
+/* TEMAC Synthesis features */
+#define TEMAC_FEATURE_RX_CSUM  (1 << 0)
+#define TEMAC_FEATURE_TX_CSUM  (1 << 1)
+
 /* TX/RX CURDESC_PTR points to first descriptor */
 /* TX/RX TAILDESC_PTR points to last descriptor in linked list */
 
@@ -353,6 +357,7 @@ struct temac_local {
         struct mutex indirect_mutex;
         u32 options;                    /* Current options word */
         int last_link;
+        unsigned int temac_features;
 
         /* Buffer descriptors */
         struct cdmac_bd *tx_bd_v;
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index b59b24d667f..52dcc849564 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -245,7 +245,7 @@ static int temac_dma_bd_init(struct net_device *ndev)
                                           CHNL_CTRL_IRQ_COAL_EN);
         /* 0x10220483 */
         /* 0x00100483 */
-        lp->dma_out(lp, RX_CHNL_CTRL, 0xff010000 |
+        lp->dma_out(lp, RX_CHNL_CTRL, 0xff070000 |
                                           CHNL_CTRL_IRQ_EN |
                                           CHNL_CTRL_IRQ_DLY_EN |
                                           CHNL_CTRL_IRQ_COAL_EN |
@@ -574,6 +574,10 @@ static void temac_start_xmit_done(struct net_device *ndev)
                 if (cur_p->app4)
                         dev_kfree_skb_irq((struct sk_buff *)cur_p->app4);
                 cur_p->app0 = 0;
+                cur_p->app1 = 0;
+                cur_p->app2 = 0;
+                cur_p->app3 = 0;
+                cur_p->app4 = 0;
 
                 ndev->stats.tx_packets++;
                 ndev->stats.tx_bytes += cur_p->len;
@@ -589,6 +593,29 @@ static void temac_start_xmit_done(struct net_device *ndev)
         netif_wake_queue(ndev);
 }
 
+static inline int temac_check_tx_bd_space(struct temac_local *lp, int num_frag)
+{
+        struct cdmac_bd *cur_p;
+        int tail;
+
+        tail = lp->tx_bd_tail;
+        cur_p = &lp->tx_bd_v[tail];
+
+        do {
+                if (cur_p->app0)
+                        return NETDEV_TX_BUSY;
+
+                tail++;
+                if (tail >= TX_BD_NUM)
+                        tail = 0;
+
+                cur_p = &lp->tx_bd_v[tail];
+                num_frag--;
+        } while (num_frag >= 0);
+
+        return 0;
+}
+
 static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
         struct temac_local *lp = netdev_priv(ndev);
@@ -603,7 +630,7 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         start_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail;
         cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
 
-        if (cur_p->app0 & STS_CTRL_APP0_CMPLT) {
+        if (temac_check_tx_bd_space(lp, num_frag)) {
                 if (!netif_queue_stopped(ndev)) {
                         netif_stop_queue(ndev);
                         return NETDEV_TX_BUSY;
@@ -613,29 +640,14 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 
         cur_p->app0 = 0;
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const struct iphdr *ip = ip_hdr(skb);
-                int length = 0, start = 0, insert = 0;
-
-                switch (ip->protocol) {
-                case IPPROTO_TCP:
-                        start = sizeof(struct iphdr) + ETH_HLEN;
-                        insert = sizeof(struct iphdr) + ETH_HLEN + 16;
-                        length = ip->tot_len - sizeof(struct iphdr);
-                        break;
-                case IPPROTO_UDP:
-                        start = sizeof(struct iphdr) + ETH_HLEN;
-                        insert = sizeof(struct iphdr) + ETH_HLEN + 6;
-                        length = ip->tot_len - sizeof(struct iphdr);
-                        break;
-                default:
-                        break;
-                }
-                cur_p->app1 = ((start << 16) | insert);
-                cur_p->app2 = csum_tcpudp_magic(ip->saddr, ip->daddr,
-                                                length, ip->protocol, 0);
-                skb->data[insert] = 0;
-                skb->data[insert + 1] = 0;
+                unsigned int csum_start_off = skb_transport_offset(skb);
+                unsigned int csum_index_off = csum_start_off + skb->csum_offset;
+
+                cur_p->app0 |= 1; /* TX Checksum Enabled */
+                cur_p->app1 = (csum_start_off << 16) | csum_index_off;
+                cur_p->app2 = 0;  /* initial checksum seed */
         }
+
         cur_p->app0 |= STS_CTRL_APP0_SOP;
         cur_p->len = skb_headlen(skb);
         cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, skb->len,
@@ -699,6 +711,15 @@ static void ll_temac_recv(struct net_device *ndev)
                 skb->protocol = eth_type_trans(skb, ndev);
                 skb->ip_summed = CHECKSUM_NONE;
 
+                /* if we're doing rx csum offload, set it up */
+                if (((lp->temac_features & TEMAC_FEATURE_RX_CSUM) != 0) &&
+                        (skb->protocol == __constant_htons(ETH_P_IP)) &&
+                        (skb->len > 64)) {
+
+                        skb->csum = cur_p->app3 & 0xFFFF;
+                        skb->ip_summed = CHECKSUM_COMPLETE;
+                }
+
                 netif_rx(skb);
 
                 ndev->stats.rx_packets++;
@@ -883,6 +904,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
         struct temac_local *lp;
         struct net_device *ndev;
         const void *addr;
+        __be32 *p;
         int size, rc = 0;
 
         /* Init network device structure */
@@ -920,14 +942,26 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
         mutex_init(&lp->indirect_mutex);
 
         /* map device registers */
-        lp->regs = of_iomap(op->node, 0);
+        lp->regs = of_iomap(op->dev.of_node, 0);
         if (!lp->regs) {
                 dev_err(&op->dev, "could not map temac regs.\n");
                 goto nodev;
         }
 
+        /* Setup checksum offload, but default to off if not specified */
+        lp->temac_features = 0;
+        p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
+        if (p && be32_to_cpu(*p)) {
+                lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
+                /* Can checksum TCP/UDP over IPv4. */
+                ndev->features |= NETIF_F_IP_CSUM;
+        }
+        p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
+        if (p && be32_to_cpu(*p))
+                lp->temac_features |= TEMAC_FEATURE_RX_CSUM;
+
         /* Find the DMA node, map the DMA registers, and decode the DMA IRQs */
-        np = of_parse_phandle(op->node, "llink-connected", 0);
+        np = of_parse_phandle(op->dev.of_node, "llink-connected", 0);
         if (!np) {
                 dev_err(&op->dev, "could not find DMA node\n");
                 goto nodev;
@@ -950,7 +984,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
 
         lp->rx_irq = irq_of_parse_and_map(np, 0);
         lp->tx_irq = irq_of_parse_and_map(np, 1);
-        if (!lp->rx_irq || !lp->tx_irq) {
+        if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
                 dev_err(&op->dev, "could not determine irqs\n");
                 rc = -ENOMEM;
                 goto nodev;
@@ -959,7 +993,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
         of_node_put(np); /* Finished with the DMA node; drop the reference */
 
         /* Retrieve the MAC address */
-        addr = of_get_property(op->node, "local-mac-address", &size);
+        addr = of_get_property(op->dev.of_node, "local-mac-address", &size);
         if ((!addr) || (size != 6)) {
                 dev_err(&op->dev, "could not find MAC address\n");
                 rc = -ENODEV;
@@ -967,11 +1001,11 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
         }
         temac_set_mac_address(ndev, (void *)addr);
 
-        rc = temac_mdio_setup(lp, op->node);
+        rc = temac_mdio_setup(lp, op->dev.of_node);
         if (rc)
                 dev_warn(&op->dev, "error registering MDIO bus\n");
 
-        lp->phy_node = of_parse_phandle(op->node, "phy-handle", 0);
+        lp->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
         if (lp->phy_node)
                 dev_dbg(lp->dev, "using PHY node %s (%p)\n", np->full_name, np);
 
@@ -1024,12 +1058,12 @@ static struct of_device_id temac_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, temac_of_match);
 
 static struct of_platform_driver temac_of_driver = {
-        .match_table = temac_of_match,
         .probe = temac_of_probe,
         .remove = __devexit_p(temac_of_remove),
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "xilinx_temac",
+                .of_match_table = temac_of_match,
         },
 };
 
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 72b7949c91b..09334f8f148 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -60,11 +60,51 @@
 #include <net/net_namespace.h>
 
 struct pcpu_lstats {
-        unsigned long packets;
-        unsigned long bytes;
+        u64 packets;
+        u64 bytes;
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        seqcount_t seq;
+#endif
         unsigned long drops;
 };
 
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+static void inline lstats_update_begin(struct pcpu_lstats *lstats)
+{
+        write_seqcount_begin(&lstats->seq);
+}
+static void inline lstats_update_end(struct pcpu_lstats *lstats)
+{
+        write_seqcount_end(&lstats->seq);
+}
+static void inline lstats_fetch_and_add(u64 *packets, u64 *bytes, const struct pcpu_lstats *lstats)
+{
+        u64 tpackets, tbytes;
+        unsigned int seq;
+
+        do {
+                seq = read_seqcount_begin(&lstats->seq);
+                tpackets = lstats->packets;
+                tbytes = lstats->bytes;
+        } while (read_seqcount_retry(&lstats->seq, seq));
+
+        *packets += tpackets;
+        *bytes += tbytes;
+}
+#else
+static void inline lstats_update_begin(struct pcpu_lstats *lstats)
+{
+}
+static void inline lstats_update_end(struct pcpu_lstats *lstats)
+{
+}
+static void inline lstats_fetch_and_add(u64 *packets, u64 *bytes, const struct pcpu_lstats *lstats)
+{
+        *packets += lstats->packets;
+        *bytes += lstats->bytes;
+}
+#endif
+
 /*
  * The higher levels take care of making this non-reentrant (it's
  * called with bh's disabled).
@@ -86,21 +126,23 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
 
         len = skb->len;
         if (likely(netif_rx(skb) == NET_RX_SUCCESS)) {
+                lstats_update_begin(lb_stats);
                 lb_stats->bytes += len;
                 lb_stats->packets++;
+                lstats_update_end(lb_stats);
         } else
                 lb_stats->drops++;
 
         return NETDEV_TX_OK;
 }
 
-static struct net_device_stats *loopback_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev)
 {
         const struct pcpu_lstats __percpu *pcpu_lstats;
-        struct net_device_stats *stats = &dev->stats;
-        unsigned long bytes = 0;
-        unsigned long packets = 0;
-        unsigned long drops = 0;
+        struct rtnl_link_stats64 *stats = &dev->stats64;
+        u64 bytes = 0;
+        u64 packets = 0;
+        u64 drops = 0;
         int i;
 
         pcpu_lstats = (void __percpu __force *)dev->ml_priv;
@@ -108,8 +150,7 @@ static struct net_device_stats *loopback_get_stats(struct net_device *dev)
                 const struct pcpu_lstats *lb_stats;
 
                 lb_stats = per_cpu_ptr(pcpu_lstats, i);
-                bytes   += lb_stats->bytes;
-                packets += lb_stats->packets;
+                lstats_fetch_and_add(&packets, &bytes, lb_stats);
                 drops   += lb_stats->drops;
         }
         stats->rx_packets = packets;
@@ -158,7 +199,7 @@ static void loopback_dev_free(struct net_device *dev)
 static const struct net_device_ops loopback_ops = {
         .ndo_init      = loopback_dev_init,
         .ndo_start_xmit= loopback_xmit,
-        .ndo_get_stats = loopback_get_stats,
+        .ndo_get_stats64 = loopback_get_stats64,
 };
 
 /*
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index 1136c9a22b6..3832fa4961d 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -157,6 +157,8 @@ static void dayna_block_output(struct net_device *dev, int count,
 #define memcpy_fromio(a, b, c)  memcpy((a), (void *)(b), (c))
 #define memcpy_toio(a, b, c)    memcpy((void *)(a), (b), (c))
 
+#define memcmp_withio(a, b, c)  memcmp((a), (void *)(b), (c))
+
 /* Slow Sane (16-bit chunk memory read/write) Cabletron uses this */
 static void slow_sane_get_8390_hdr(struct net_device *dev,
                                    struct e8390_pkt_hdr *hdr, int ring_page);
@@ -164,8 +166,8 @@ static void slow_sane_block_input(struct net_device *dev, int count,
                                   struct sk_buff *skb, int ring_offset);
 static void slow_sane_block_output(struct net_device *dev, int count,
                                    const unsigned char *buf, int start_page);
-static void word_memcpy_tocard(void *tp, const void *fp, int count);
-static void word_memcpy_fromcard(void *tp, const void *fp, int count);
+static void word_memcpy_tocard(unsigned long tp, const void *fp, int count);
+static void word_memcpy_fromcard(void *tp, unsigned long fp, int count);
 
 static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
 {
@@ -245,9 +247,9 @@ static enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
         unsigned long outdata = 0xA5A0B5B0;
         unsigned long indata =  0x00000000;
         /* Try writing 32 bits */
-        memcpy(membase, &outdata, 4);
+        memcpy_toio(membase, &outdata, 4);
         /* Now compare them */
-        if (memcmp((char *)&outdata, (char *)membase, 4) == 0)
+        if (memcmp_withio(&outdata, membase, 4) == 0)
                 return ACCESS_32;
         /* Write 16 bit output */
         word_memcpy_tocard(membase, &outdata, 4);
@@ -554,7 +556,7 @@ static int __init mac8390_initdev(struct net_device *dev,
         case MAC8390_APPLE:
                 switch (mac8390_testio(dev->mem_start)) {
                 case ACCESS_UNKNOWN:
-                        pr_info("Don't know how to access card memory!\n");
+                        pr_err("Don't know how to access card memory!\n");
                         return -ENODEV;
                         break;
 
@@ -641,12 +643,13 @@ static int __init mac8390_initdev(struct net_device *dev,
 
 static int mac8390_open(struct net_device *dev)
 {
+        int err;
+
         __ei_open(dev);
-        if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) {
-                pr_info("%s: unable to get IRQ %d.\n", dev->name, dev->irq);
-                return -EAGAIN;
-        }
-        return 0;
+        err = request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev);
+        if (err)
+                pr_err("%s: unable to get IRQ %d\n", dev->name, dev->irq);
+        return err;
 }
 
 static int mac8390_close(struct net_device *dev)
@@ -731,7 +734,7 @@ static void sane_get_8390_hdr(struct net_device *dev,
                               struct e8390_pkt_hdr *hdr, int ring_page)
 {
         unsigned long hdr_start = (ring_page - WD_START_PG)<<8;
-        memcpy_fromio((void *)hdr, (char *)dev->mem_start + hdr_start, 4);
+        memcpy_fromio(hdr, dev->mem_start + hdr_start, 4);
         /* Fix endianness */
         hdr->count = swab16(hdr->count);
 }
@@ -745,14 +748,13 @@ static void sane_block_input(struct net_device *dev, int count,
         if (xfer_start + count > ei_status.rmem_end) {
                 /* We must wrap the input move. */
                 int semi_count = ei_status.rmem_end - xfer_start;
-                memcpy_fromio(skb->data, (char *)dev->mem_start + xfer_base,
+                memcpy_fromio(skb->data, dev->mem_start + xfer_base,
                               semi_count);
                 count -= semi_count;
-                memcpy_toio(skb->data + semi_count,
-                            (char *)ei_status.rmem_start, count);
-        } else {
-                memcpy_fromio(skb->data, (char *)dev->mem_start + xfer_base,
+                memcpy_fromio(skb->data + semi_count, ei_status.rmem_start,
                               count);
+        } else {
+                memcpy_fromio(skb->data, dev->mem_start + xfer_base, count);
         }
 }
 
@@ -761,7 +763,7 @@ static void sane_block_output(struct net_device *dev, int count,
 {
         long shmem = (start_page - WD_START_PG)<<8;
 
-        memcpy_toio((char *)dev->mem_start + shmem, buf, count);
+        memcpy_toio(dev->mem_start + shmem, buf, count);
 }
 
 /* dayna block input/output */
@@ -812,7 +814,7 @@ static void slow_sane_get_8390_hdr(struct net_device *dev,
                                    int ring_page)
 {
         unsigned long hdr_start = (ring_page - WD_START_PG)<<8;
-        word_memcpy_fromcard(hdr, (char *)dev->mem_start + hdr_start, 4);
+        word_memcpy_fromcard(hdr, dev->mem_start + hdr_start, 4);
         /* Register endianism - fix here rather than 8390.c */
         hdr->count = (hdr->count&0xFF)<<8|(hdr->count>>8);
 }
@@ -826,15 +828,14 @@ static void slow_sane_block_input(struct net_device *dev, int count,
         if (xfer_start + count > ei_status.rmem_end) {
                 /* We must wrap the input move. */
                 int semi_count = ei_status.rmem_end - xfer_start;
-                word_memcpy_fromcard(skb->data,
-                                     (char *)dev->mem_start + xfer_base,
+                word_memcpy_fromcard(skb->data, dev->mem_start + xfer_base,
                                      semi_count);
                 count -= semi_count;
                 word_memcpy_fromcard(skb->data + semi_count,
-                                     (char *)ei_status.rmem_start, count);
+                                     ei_status.rmem_start, count);
         } else {
-                word_memcpy_fromcard(skb->data,
-                                     (char *)dev->mem_start + xfer_base, count);
+                word_memcpy_fromcard(skb->data, dev->mem_start + xfer_base,
+                                     count);
         }
 }
 
@@ -843,12 +844,12 @@ static void slow_sane_block_output(struct net_device *dev, int count,
 {
         long shmem = (start_page - WD_START_PG)<<8;
 
-        word_memcpy_tocard((char *)dev->mem_start + shmem, buf, count);
+        word_memcpy_tocard(dev->mem_start + shmem, buf, count);
 }
 
-static void word_memcpy_tocard(void *tp, const void *fp, int count)
+static void word_memcpy_tocard(unsigned long tp, const void *fp, int count)
 {
-        volatile unsigned short *to = tp;
+        volatile unsigned short *to = (void *)tp;
         const unsigned short *from = fp;
 
         count++;
@@ -858,10 +859,10 @@ static void word_memcpy_tocard(void *tp, const void *fp, int count)
                 *to++ = *from++;
 }
 
-static void word_memcpy_fromcard(void *tp, const void *fp, int count)
+static void word_memcpy_fromcard(void *tp, unsigned long fp, int count)
 {
         unsigned short *to = tp;
-        const volatile unsigned short *from = fp;
+        const volatile unsigned short *from = (const void *)fp;
 
         count++;
         count /= 2;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 4e238afab4a..e096875aa05 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -37,8 +37,14 @@ struct macvlan_port {
         struct net_device       *dev;
         struct hlist_head       vlan_hash[MACVLAN_HASH_SIZE];
         struct list_head        vlans;
+        struct rcu_head         rcu;
 };
 
+#define macvlan_port_get_rcu(dev) \
+        ((struct macvlan_port *) rcu_dereference(dev->rx_handler_data))
+#define macvlan_port_get(dev) ((struct macvlan_port *) dev->rx_handler_data)
+#define macvlan_port_exists(dev) (dev->priv_flags & IFF_MACVLAN_PORT)
+
 static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
                                                const unsigned char *addr)
 {
@@ -145,15 +151,16 @@ static void macvlan_broadcast(struct sk_buff *skb,
 }
 
 /* called under rcu_read_lock() from netif_receive_skb */
-static struct sk_buff *macvlan_handle_frame(struct macvlan_port *port,
-                                            struct sk_buff *skb)
+static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
 {
+        struct macvlan_port *port;
         const struct ethhdr *eth = eth_hdr(skb);
         const struct macvlan_dev *vlan;
         const struct macvlan_dev *src;
         struct net_device *dev;
         unsigned int len;
 
+        port = macvlan_port_get_rcu(skb->dev);
         if (is_multicast_ether_addr(eth->h_dest)) {
                 src = macvlan_hash_lookup(port, eth->h_source);
                 if (!src)
@@ -515,6 +522,7 @@ static int macvlan_port_create(struct net_device *dev)
 {
         struct macvlan_port *port;
         unsigned int i;
+        int err;
 
         if (dev->type != ARPHRD_ETHER || dev->flags & IFF_LOOPBACK)
                 return -EINVAL;
@@ -527,19 +535,32 @@ static int macvlan_port_create(struct net_device *dev)
         INIT_LIST_HEAD(&port->vlans);
         for (i = 0; i < MACVLAN_HASH_SIZE; i++)
                 INIT_HLIST_HEAD(&port->vlan_hash[i]);
-        rcu_assign_pointer(dev->macvlan_port, port);
-        return 0;
+
+        err = netdev_rx_handler_register(dev, macvlan_handle_frame, port);
+        if (err)
+                kfree(port);
+
+        dev->priv_flags |= IFF_MACVLAN_PORT;
+        return err;
 }
 
-static void macvlan_port_destroy(struct net_device *dev)
+static void macvlan_port_rcu_free(struct rcu_head *head)
 {
-        struct macvlan_port *port = dev->macvlan_port;
+        struct macvlan_port *port;
 
-        rcu_assign_pointer(dev->macvlan_port, NULL);
-        synchronize_rcu();
+        port = container_of(head, struct macvlan_port, rcu);
         kfree(port);
 }
 
+static void macvlan_port_destroy(struct net_device *dev)
+{
+        struct macvlan_port *port = macvlan_port_get(dev);
+
+        dev->priv_flags &= ~IFF_MACVLAN_PORT;
+        netdev_rx_handler_unregister(dev);
+        call_rcu(&port->rcu, macvlan_port_rcu_free);
+}
+
 static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[])
 {
         if (tb[IFLA_ADDRESS]) {
@@ -615,12 +636,12 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
         if (!tb[IFLA_ADDRESS])
                 random_ether_addr(dev->dev_addr);
 
-        if (lowerdev->macvlan_port == NULL) {
+        if (!macvlan_port_exists(lowerdev)) {
                 err = macvlan_port_create(lowerdev);
                 if (err < 0)
                         return err;
         }
-        port = lowerdev->macvlan_port;
+        port = macvlan_port_get(lowerdev);
 
         vlan->lowerdev = lowerdev;
         vlan->dev      = dev;
@@ -634,11 +655,18 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
 
         err = register_netdevice(dev);
         if (err < 0)
-                return err;
+                goto destroy_port;
 
         list_add_tail(&vlan->list, &port->vlans);
         netif_stacked_transfer_operstate(lowerdev, dev);
+
         return 0;
+
+destroy_port:
+        if (list_empty(&port->vlans))
+                macvlan_port_destroy(lowerdev);
+
+        return err;
 }
 EXPORT_SYMBOL_GPL(macvlan_common_newlink);
 
@@ -723,10 +751,11 @@ static int macvlan_device_event(struct notifier_block *unused,
         struct macvlan_dev *vlan, *next;
         struct macvlan_port *port;
 
-        port = dev->macvlan_port;
-        if (port == NULL)
+        if (!macvlan_port_exists(dev))
                 return NOTIFY_DONE;
 
+        port = macvlan_port_get(dev);
+
         switch (event) {
         case NETDEV_CHANGE:
                 list_for_each_entry(vlan, &port->vlans, list)
@@ -760,14 +789,12 @@ static int __init macvlan_init_module(void)
         int err;
 
         register_netdevice_notifier(&macvlan_notifier_block);
-        macvlan_handle_frame_hook = macvlan_handle_frame;
 
         err = macvlan_link_register(&macvlan_link_ops);
         if (err < 0)
                 goto err1;
         return 0;
 err1:
-        macvlan_handle_frame_hook = NULL;
         unregister_netdevice_notifier(&macvlan_notifier_block);
         return err;
 }
@@ -775,7 +802,6 @@ err1:
 static void __exit macvlan_cleanup_module(void)
 {
         rtnl_link_unregister(&macvlan_link_ops);
-        macvlan_handle_frame_hook = NULL;
         unregister_netdevice_notifier(&macvlan_notifier_block);
 }
 
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 96180c0ec20..a0d8a26f5a0 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -961,6 +961,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         }
 
         SET_NETDEV_DEV(dev, &mdev->dev->pdev->dev);
+        dev->dev_id =  port - 1;
 
         /*
          * Initialize driver private data
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c
index 423053482ed..22d0b3b796b 100644
--- a/drivers/net/mlx4/eq.c
+++ b/drivers/net/mlx4/eq.c
@@ -110,7 +110,7 @@ struct mlx4_eqe {
                 u32             raw[6];
                 struct {
                         __be32  cqn;
-                } __attribute__((packed)) comp;
+                } __packed comp;
                 struct {
                         u16     reserved1;
                         __be16  token;
@@ -118,27 +118,27 @@ struct mlx4_eqe {
                         u8      reserved3[3];
                         u8      status;
                         __be64  out_param;
-                } __attribute__((packed)) cmd;
+                } __packed cmd;
                 struct {
                         __be32  qpn;
-                } __attribute__((packed)) qp;
+                } __packed qp;
                 struct {
                         __be32  srqn;
-                } __attribute__((packed)) srq;
+                } __packed srq;
                 struct {
                         __be32  cqn;
                         u32     reserved1;
                         u8      reserved2[3];
                         u8      syndrome;
-                } __attribute__((packed)) cq_err;
+                } __packed cq_err;
                 struct {
                         u32     reserved1[2];
                         __be32  port;
-                } __attribute__((packed)) port_change;
+                } __packed port_change;
         }                       event;
         u8                      reserved3[3];
         u8                      owner;
-} __attribute__((packed));
+} __packed;
 
 static void eq_set_ci(struct mlx4_eq *eq, int req_not)
 {
diff --git a/drivers/net/mlx4/icm.c b/drivers/net/mlx4/icm.c
index 57288ca1395..b07e4dee80a 100644
--- a/drivers/net/mlx4/icm.c
+++ b/drivers/net/mlx4/icm.c
@@ -163,28 +163,30 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,
                         ret = mlx4_alloc_icm_pages(&chunk->mem[chunk->npages],
                                                    cur_order, gfp_mask);
 
-                if (!ret) {
-                        ++chunk->npages;
-
-                        if (coherent)
-                                ++chunk->nsg;
-                        else if (chunk->npages == MLX4_ICM_CHUNK_LEN) {
-                                chunk->nsg = pci_map_sg(dev->pdev, chunk->mem,
-                                                        chunk->npages,
-                                                        PCI_DMA_BIDIRECTIONAL);
+                if (ret) {
+                        if (--cur_order < 0)
+                                goto fail;
+                        else
+                                continue;
+                }
 
-                                if (chunk->nsg <= 0)
-                                        goto fail;
+                ++chunk->npages;
 
-                                chunk = NULL;
-                        }
+                if (coherent)
+                        ++chunk->nsg;
+                else if (chunk->npages == MLX4_ICM_CHUNK_LEN) {
+                        chunk->nsg = pci_map_sg(dev->pdev, chunk->mem,
+                                                chunk->npages,
+                                                PCI_DMA_BIDIRECTIONAL);
 
-                        npages -= 1 << cur_order;
-                } else {
-                        --cur_order;
-                        if (cur_order < 0)
+                        if (chunk->nsg <= 0)
                                 goto fail;
                 }
+
+                if (chunk->npages == MLX4_ICM_CHUNK_LEN)
+                        chunk = NULL;
+
+                npages -= 1 << cur_order;
         }
 
         if (!coherent && chunk) {
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index bc72d6e4919..13343e88499 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -40,6 +40,7 @@
 #include <linux/mutex.h>
 #include <linux/radix-tree.h>
 #include <linux/timer.h>
+#include <linux/semaphore.h>
 #include <linux/workqueue.h>
 
 #include <linux/mlx4/device.h>
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index 3dc69be4949..9c188bdd7f4 100644
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
@@ -58,7 +58,7 @@ struct mlx4_mpt_entry {
         __be32 mtt_sz;
         __be32 entity_size;
         __be32 first_byte_offset;
-} __attribute__((packed));
+} __packed;
 
 #define MLX4_MPT_FLAG_SW_OWNS       (0xfUL << 28)
 #define MLX4_MPT_FLAG_FREE          (0x3UL << 28)
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 3898108f98c..1a57c3da1f4 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -928,7 +928,7 @@ static const struct net_device_ops myri_ops = {
 
 static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
         static unsigned version_printed;
         struct net_device *dev;
         struct myri_eth *mp;
@@ -1161,8 +1161,11 @@ static const struct of_device_id myri_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, myri_sbus_match);
 
 static struct of_platform_driver myri_sbus_driver = {
-        .name           = "myri",
-        .match_table    = myri_sbus_match,
+        .driver = {
+                .name = "myri",
+                .owner = THIS_MODULE,
+                .of_match_table = myri_sbus_match,
+        },
         .probe          = myri_sbus_probe,
         .remove         = __devexit_p(myri_sbus_remove),
 };
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index c61a61f177b..6ce6ce1df6d 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -2560,7 +2560,8 @@ netxen_sysfs_validate_crb(struct netxen_adapter *adapter,
 }
 
 static ssize_t
-netxen_sysfs_read_crb(struct kobject *kobj, struct bin_attribute *attr,
+netxen_sysfs_read_crb(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t offset, size_t size)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
@@ -2587,7 +2588,8 @@ netxen_sysfs_read_crb(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 static ssize_t
-netxen_sysfs_write_crb(struct kobject *kobj, struct bin_attribute *attr,
+netxen_sysfs_write_crb(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t offset, size_t size)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
@@ -2627,7 +2629,8 @@ netxen_sysfs_validate_mem(struct netxen_adapter *adapter,
 }
 
 static ssize_t
-netxen_sysfs_read_mem(struct kobject *kobj, struct bin_attribute *attr,
+netxen_sysfs_read_mem(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t offset, size_t size)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
@@ -2647,7 +2650,7 @@ netxen_sysfs_read_mem(struct kobject *kobj, struct bin_attribute *attr,
         return size;
 }
 
-static ssize_t netxen_sysfs_write_mem(struct kobject *kobj,
+static ssize_t netxen_sysfs_write_mem(struct file *filp, struct kobject *kobj,
                 struct bin_attribute *attr, char *buf,
                 loff_t offset, size_t size)
 {
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 30abb4e436f..63e8e3893bd 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -9115,7 +9115,7 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map)
         const u32 *int_prop;
         int i;
 
-        int_prop = of_get_property(op->node, "interrupts", NULL);
+        int_prop = of_get_property(op->dev.of_node, "interrupts", NULL);
         if (!int_prop)
                 return -ENODEV;
 
@@ -9266,7 +9266,7 @@ static int __devinit niu_get_of_props(struct niu *np)
         int prop_len;
 
         if (np->parent->plat_type == PLAT_TYPE_NIU)
-                dp = np->op->node;
+                dp = np->op->dev.of_node;
         else
                 dp = pci_device_to_OF_node(np->pdev);
 
@@ -10083,10 +10083,10 @@ static int __devinit niu_of_probe(struct of_device *op,
 
         niu_driver_version();
 
-        reg = of_get_property(op->node, "reg", NULL);
+        reg = of_get_property(op->dev.of_node, "reg", NULL);
         if (!reg) {
                 dev_err(&op->dev, "%s: No 'reg' property, aborting\n",
-                        op->node->full_name);
+                        op->dev.of_node->full_name);
                 return -ENODEV;
         }
 
@@ -10099,7 +10099,7 @@ static int __devinit niu_of_probe(struct of_device *op,
         np = netdev_priv(dev);
 
         memset(&parent_id, 0, sizeof(parent_id));
-        parent_id.of = of_get_parent(op->node);
+        parent_id.of = of_get_parent(op->dev.of_node);
 
         np->parent = niu_get_parent(np, &parent_id,
                                     PLAT_TYPE_NIU);
@@ -10234,8 +10234,11 @@ static const struct of_device_id niu_match[] = {
 MODULE_DEVICE_TABLE(of, niu_match);
 
 static struct of_platform_driver niu_of_driver = {
-        .name           = "niu",
-        .match_table    = niu_match,
+        .driver = {
+                .name = "niu",
+                .owner = THIS_MODULE,
+                .of_match_table = niu_match,
+        },
         .probe          = niu_of_probe,
         .remove         = __devexit_p(niu_of_remove),
 };
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index 8ee929b796d..dbd00345373 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -53,6 +53,9 @@
 
 #define MII_LXT971_ISR          19  /* Interrupt Status Register */
 
+/* register definitions for the 973 */
+#define MII_LXT973_PCR 16 /* Port Configuration Register */
+#define PCR_FIBER_SELECT 1
 
 MODULE_DESCRIPTION("Intel LXT PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -119,6 +122,33 @@ static int lxt971_config_intr(struct phy_device *phydev)
         return err;
 }
 
+static int lxt973_probe(struct phy_device *phydev)
+{
+        int val = phy_read(phydev, MII_LXT973_PCR);
+
+        if (val & PCR_FIBER_SELECT) {
+                /*
+                 * If fiber is selected, then the only correct setting
+                 * is 100Mbps, full duplex, and auto negotiation off.
+                 */
+                val = phy_read(phydev, MII_BMCR);
+                val |= (BMCR_SPEED100 | BMCR_FULLDPLX);
+                val &= ~BMCR_ANENABLE;
+                phy_write(phydev, MII_BMCR, val);
+                /* Remember that the port is in fiber mode. */
+                phydev->priv = lxt973_probe;
+        } else {
+                phydev->priv = NULL;
+        }
+        return 0;
+}
+
+static int lxt973_config_aneg(struct phy_device *phydev)
+{
+        /* Do nothing if port is in fiber mode. */
+        return phydev->priv ? 0 : genphy_config_aneg(phydev);
+}
+
 static struct phy_driver lxt970_driver = {
         .phy_id         = 0x78100000,
         .name           = "LXT970",
@@ -146,6 +176,18 @@ static struct phy_driver lxt971_driver = {
         .driver         = { .owner = THIS_MODULE,},
 };
 
+static struct phy_driver lxt973_driver = {
+        .phy_id         = 0x00137a10,
+        .name           = "LXT973",
+        .phy_id_mask    = 0xfffffff0,
+        .features       = PHY_BASIC_FEATURES,
+        .flags          = 0,
+        .probe          = lxt973_probe,
+        .config_aneg    = lxt973_config_aneg,
+        .read_status    = genphy_read_status,
+        .driver         = { .owner = THIS_MODULE,},
+};
+
 static int __init lxt_init(void)
 {
         int ret;
@@ -157,9 +199,15 @@ static int __init lxt_init(void)
         ret = phy_driver_register(&lxt971_driver);
         if (ret)
                 goto err2;
+
+        ret = phy_driver_register(&lxt973_driver);
+        if (ret)
+                goto err3;
         return 0;
 
- err2:  
+ err3:
+        phy_driver_unregister(&lxt971_driver);
+ err2:
         phy_driver_unregister(&lxt970_driver);
  err1:
         return ret;
@@ -169,6 +217,7 @@ static void __exit lxt_exit(void)
 {
         phy_driver_unregister(&lxt970_driver);
         phy_driver_unregister(&lxt971_driver);
+        phy_driver_unregister(&lxt973_driver);
 }
 
 module_init(lxt_init);
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 35897134a5d..fc5fef2a817 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -199,12 +199,12 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,
         if (!pdata)
                 return -ENOMEM;
 
-        ret = of_get_gpio(ofdev->node, 0);
+        ret = of_get_gpio(ofdev->dev.of_node, 0);
         if (ret < 0)
                 goto out_free;
         pdata->mdc = ret;
 
-        ret = of_get_gpio(ofdev->node, 1);
+        ret = of_get_gpio(ofdev->dev.of_node, 1);
         if (ret < 0)
                 goto out_free;
         pdata->mdio = ret;
@@ -213,7 +213,7 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,
         if (!new_bus)
                 goto out_free;
 
-        ret = of_mdiobus_register(new_bus, ofdev->node);
+        ret = of_mdiobus_register(new_bus, ofdev->dev.of_node);
         if (ret)
                 mdio_gpio_bus_deinit(&ofdev->dev);
 
@@ -241,8 +241,11 @@ static struct of_device_id mdio_ofgpio_match[] = {
 MODULE_DEVICE_TABLE(of, mdio_ofgpio_match);
 
 static struct of_platform_driver mdio_ofgpio_driver = {
-        .name = "mdio-gpio",
-        .match_table = mdio_ofgpio_match,
+        .driver = {
+                .name = "mdio-gpio",
+                .owner = THIS_MODULE,
+                .of_match_table = mdio_ofgpio_match,
+        },
         .probe = mdio_ofgpio_probe,
         .remove = __devexit_p(mdio_ofgpio_remove),
 };
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 5441688daba..e7b4187da05 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -69,7 +69,6 @@
 
 #define MPHDRLEN        6       /* multilink protocol header length */
 #define MPHDRLEN_SSN    4       /* ditto with short sequence numbers */
-#define MIN_FRAG_SIZE   64
 
 /*
  * An instance of /dev/ppp can be associated with either a ppp
@@ -539,14 +538,9 @@ static int get_filter(void __user *arg, struct sock_filter **p)
         }
 
         len = uprog.len * sizeof(struct sock_filter);
-        code = kmalloc(len, GFP_KERNEL);
-        if (code == NULL)
-                return -ENOMEM;
-
-        if (copy_from_user(code, uprog.filter, len)) {
-                kfree(code);
-                return -EFAULT;
-        }
+        code = memdup_user(uprog.filter, len);
+        if (IS_ERR(code))
+                return PTR_ERR(code);
 
         err = sk_chk_filter(code, uprog.len);
         if (err) {
@@ -1422,7 +1416,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
                 flen = len;
                 if (nfree > 0) {
                         if (pch->speed == 0) {
-                                flen = totlen/nfree;
+                                flen = len/nfree;
                                 if (nbigger > 0) {
                                         flen++;
                                         nbigger--;
@@ -1933,9 +1927,9 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
         /* If the queue is getting long, don't wait any longer for packets
            before the start of the queue. */
         if (skb_queue_len(&ppp->mrq) >= PPP_MP_MAX_QLEN) {
-                struct sk_buff *skb = skb_peek(&ppp->mrq);
-                if (seq_before(ppp->minseq, skb->sequence))
-                        ppp->minseq = skb->sequence;
+                struct sk_buff *mskb = skb_peek(&ppp->mrq);
+                if (seq_before(ppp->minseq, mskb->sequence))
+                        ppp->minseq = mskb->sequence;
         }
 
         /* Pull completed packets off the queue and receive them. */
@@ -2926,5 +2920,5 @@ EXPORT_SYMBOL(ppp_output_wakeup);
 EXPORT_SYMBOL(ppp_register_compressor);
 EXPORT_SYMBOL(ppp_unregister_compressor);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(PPP_MAJOR);
-MODULE_ALIAS("/dev/ppp");
+MODULE_ALIAS_CHARDEV(PPP_MAJOR, 0);
+MODULE_ALIAS("devname:ppp");
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index b1b93ff2351..344ef330e12 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -89,7 +89,6 @@
 #define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS)
 #define PPPOE_HASH_MASK (PPPOE_HASH_SIZE - 1)
 
-static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
 
 static const struct proto_ops pppoe_ops;
@@ -289,6 +288,7 @@ static void pppoe_flush_dev(struct net_device *dev)
         struct pppoe_net *pn;
         int i;
 
+        pn = pppoe_pernet(dev_net(dev));
         write_lock_bh(&pn->hash_lock);
         for (i = 0; i < PPPOE_HASH_SIZE; i++) {
                 struct pppox_sock *po = pn->hash_table[i];
@@ -948,7 +948,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 
 abort:
         kfree_skb(skb);
-        return 1;
+        return 0;
 }
 
 /************************************************************************
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h
index 0a88b535197..f7e51b7d704 100644
--- a/drivers/net/ps3_gelic_wireless.h
+++ b/drivers/net/ps3_gelic_wireless.h
@@ -74,7 +74,7 @@ struct gelic_eurus_common_cfg {
         u16 bss_type;    /* infra or adhoc */
         u16 auth_method; /* shared key or open */
         u16 op_mode; /* B/G */
-} __attribute__((packed));
+} __packed;
 
 
 /* for GELIC_EURUS_CMD_WEP_CFG */
@@ -88,7 +88,7 @@ struct gelic_eurus_wep_cfg {
         /* all fields are big endian */
         u16 security;
         u8 key[4][16];
-} __attribute__((packed));
+} __packed;
 
 /* for GELIC_EURUS_CMD_WPA_CFG */
 enum gelic_eurus_wpa_security {
@@ -120,7 +120,7 @@ struct gelic_eurus_wpa_cfg {
         u16 security;
         u16 psk_type; /* psk key encoding type */
         u8 psk[GELIC_WL_EURUS_PSK_MAX_LEN]; /* psk key; hex or passphrase */
-} __attribute__((packed));
+} __packed;
 
 /* for GELIC_EURUS_CMD_{START,GET}_SCAN */
 enum gelic_eurus_scan_capability {
@@ -171,7 +171,7 @@ struct gelic_eurus_scan_info {
         __be32 reserved3;
         __be32 reserved4;
         u8 elements[0]; /* ie */
-} __attribute__ ((packed));
+} __packed;
 
 /* the hypervisor returns bbs up to 16 */
 #define GELIC_EURUS_MAX_SCAN  (16)
@@ -193,7 +193,7 @@ struct gelic_wl_scan_info {
 struct gelic_eurus_rssi_info {
         /* big endian */
         __be16 rssi;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* for 'stat' member of gelic_wl_info */
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 896d40df9a1..99ccdd8ac41 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -51,8 +51,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 2
-#define QLCNIC_LINUX_VERSIONID  "5.0.2"
+#define _QLCNIC_LINUX_SUBVERSION 5
+#define QLCNIC_LINUX_VERSIONID  "5.0.5"
 #define QLCNIC_DRV_IDC_VER  0x01
 
 #define QLCNIC_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
@@ -68,6 +68,7 @@
 #define QLCNIC_DECODE_VERSION(v) \
         QLCNIC_VERSION_CODE(((v) & 0xff), (((v) >> 8) & 0xff), ((v) >> 16))
 
+#define QLCNIC_MIN_FW_VERSION     QLCNIC_VERSION_CODE(4, 4, 2)
 #define QLCNIC_NUM_FLASH_SECTORS (64)
 #define QLCNIC_FLASH_SECTOR_SIZE (64 * 1024)
 #define QLCNIC_FLASH_TOTAL_SIZE  (QLCNIC_NUM_FLASH_SECTORS \
@@ -112,8 +113,10 @@
 #define TX_UDPV6_PKT    0x0c
 
 /* Tx defines */
-#define MAX_BUFFERS_PER_CMD     32
-#define TX_STOP_THRESH          ((MAX_SKB_FRAGS >> 2) + 4)
+#define MAX_TSO_HEADER_DESC     2
+#define MGMT_CMD_DESC_RESV      4
+#define TX_STOP_THRESH          ((MAX_SKB_FRAGS >> 2) + MAX_TSO_HEADER_DESC \
+                                                        + MGMT_CMD_DESC_RESV)
 #define QLCNIC_MAX_TX_TIMEOUTS  2
 
 /*
@@ -197,8 +200,7 @@ struct cmd_desc_type0 {
 
         __le64 addr_buffer4;
 
-        __le32 reserved2;
-        __le16 reserved;
+        u8 eth_addr[ETH_ALEN];
         __le16 vlan_TCI;
 
 } __attribute__ ((aligned(64)));
@@ -315,6 +317,8 @@ struct uni_data_desc{
 #define QLCNIC_BRDTYPE_P3_10G_XFP       0x0032
 #define QLCNIC_BRDTYPE_P3_10G_TP        0x0080
 
+#define QLCNIC_MSIX_TABLE_OFFSET        0x44
+
 /* Flash memory map */
 #define QLCNIC_BRDCFG_START     0x4000          /* board config */
 #define QLCNIC_BOOTLD_START     0x10000         /* bootld */
@@ -367,7 +371,7 @@ struct qlcnic_recv_crb {
  */
 struct qlcnic_cmd_buffer {
         struct sk_buff *skb;
-        struct qlcnic_skb_frag frag_array[MAX_BUFFERS_PER_CMD + 1];
+        struct qlcnic_skb_frag frag_array[MAX_SKB_FRAGS + 1];
         u32 frag_count;
 };
 
@@ -542,7 +546,17 @@ struct qlcnic_recv_context {
 #define QLCNIC_CDRP_CMD_READ_PEXQ_PARAMETERS    0x0000001c
 #define QLCNIC_CDRP_CMD_GET_LIC_CAPABILITIES    0x0000001d
 #define QLCNIC_CDRP_CMD_READ_MAX_LRO_PER_BOARD  0x0000001e
-#define QLCNIC_CDRP_CMD_MAX                     0x0000001f
+#define QLCNIC_CDRP_CMD_MAC_ADDRESS             0x0000001f
+
+#define QLCNIC_CDRP_CMD_GET_PCI_INFO            0x00000020
+#define QLCNIC_CDRP_CMD_GET_NIC_INFO            0x00000021
+#define QLCNIC_CDRP_CMD_SET_NIC_INFO            0x00000022
+#define QLCNIC_CDRP_CMD_RESET_NPAR              0x00000023
+#define QLCNIC_CDRP_CMD_GET_ESWITCH_CAPABILITY  0x00000024
+#define QLCNIC_CDRP_CMD_TOGGLE_ESWITCH          0x00000025
+#define QLCNIC_CDRP_CMD_GET_ESWITCH_STATUS      0x00000026
+#define QLCNIC_CDRP_CMD_SET_PORTMIRRORING       0x00000027
+#define QLCNIC_CDRP_CMD_CONFIGURE_ESWITCH       0x00000028
 
 #define QLCNIC_RCODE_SUCCESS            0
 #define QLCNIC_RCODE_TIMEOUT            17
@@ -556,11 +570,11 @@ struct qlcnic_recv_context {
 #define QLCNIC_CAP0_LSO                 (1 << 6)
 #define QLCNIC_CAP0_JUMBO_CONTIGUOUS    (1 << 7)
 #define QLCNIC_CAP0_LRO_CONTIGUOUS      (1 << 8)
+#define QLCNIC_CAP0_VALIDOFF            (1 << 11)
 
 /*
  * Context state
  */
-#define QLCHAL_VERSION  1
 
 #define QLCNIC_HOST_CTX_STATE_ACTIVE    2
 
@@ -592,9 +606,10 @@ struct qlcnic_hostrq_rx_ctx {
         __le32 sds_ring_offset; /* Offset to SDS config */
         __le16 num_rds_rings;   /* Count of RDS rings */
         __le16 num_sds_rings;   /* Count of SDS rings */
-        __le16 rsvd1;           /* Padding */
-        __le16 rsvd2;           /* Padding */
-        u8  reserved[128];      /* reserve space for future expansion*/
+        __le16 valid_field_offset;
+        u8  txrx_sds_binding;
+        u8  msix_handler;
+        u8  reserved[128];      /* reserve space for future expansion*/
         /* MUST BE 64-bit aligned.
            The following is packed:
            - N hostrq_rds_rings
@@ -881,12 +896,14 @@ struct qlcnic_mac_req {
 #define QLCNIC_LRO_ENABLED              0x08
 #define QLCNIC_BRIDGE_ENABLED           0X10
 #define QLCNIC_DIAG_ENABLED             0x20
+#define QLCNIC_ESWITCH_ENABLED          0x40
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
 #define MSIX_ENTRIES_PER_ADAPTER        NUM_STS_DESC_RINGS
 #define QLCNIC_MSIX_TBL_SPACE           8192
 #define QLCNIC_PCI_REG_MSIX_TBL         0x44
+#define QLCNIC_MSIX_TBL_PGSIZE          4096
 
 #define QLCNIC_NETDEV_WEIGHT    128
 #define QLCNIC_ADAPTER_UP_MAGIC 777
@@ -923,7 +940,6 @@ struct qlcnic_adapter {
         u8 mc_enabled;
         u8 max_mc_count;
         u8 rss_supported;
-        u8 rsrvd1;
         u8 fw_wait_cnt;
         u8 fw_fail_cnt;
         u8 tx_timeo_cnt;
@@ -940,6 +956,15 @@ struct qlcnic_adapter {
         u16 link_autoneg;
         u16 module_type;
 
+        u16 op_mode;
+        u16 switch_mode;
+        u16 max_tx_ques;
+        u16 max_rx_ques;
+        u16 min_tx_bw;
+        u16 max_tx_bw;
+        u16 max_mtu;
+
+        u32 fw_hal_version;
         u32 capabilities;
         u32 flags;
         u32 irq;
@@ -948,18 +973,22 @@ struct qlcnic_adapter {
         u32 int_vec_bit;
         u32 heartbit;
 
+        u8 max_mac_filters;
         u8 dev_state;
         u8 diag_test;
         u8 diag_cnt;
         u8 reset_ack_timeo;
         u8 dev_init_timeo;
-        u8 rsrd1;
         u16 msg_enable;
 
         u8 mac_addr[ETH_ALEN];
 
         u64 dev_rst_time;
 
+        struct qlcnic_pci_info *npars;
+        struct qlcnic_eswitch *eswitch;
+        struct qlcnic_nic_template *nic_ops;
+
         struct qlcnic_adapter_stats stats;
 
         struct qlcnic_recv_context recv_ctx;
@@ -984,6 +1013,53 @@ struct qlcnic_adapter {
         const struct firmware *fw;
 };
 
+struct qlcnic_info {
+        __le16  pci_func;
+        __le16  op_mode; /* 1 = Priv, 2 = NP, 3 = NP passthru */
+        __le16  phys_port;
+        __le16  switch_mode; /* 0 = disabled, 1 = int, 2 = ext */
+
+        __le32  capabilities;
+        u8      max_mac_filters;
+        u8      reserved1;
+        __le16  max_mtu;
+
+        __le16  max_tx_ques;
+        __le16  max_rx_ques;
+        __le16  min_tx_bw;
+        __le16  max_tx_bw;
+        u8      reserved2[104];
+};
+
+struct qlcnic_pci_info {
+        __le16  id; /* pci function id */
+        __le16  active; /* 1 = Enabled */
+        __le16  type; /* 1 = NIC, 2 = FCoE, 3 = iSCSI */
+        __le16  default_port; /* default port number */
+
+        __le16  tx_min_bw; /* Multiple of 100mbpc */
+        __le16  tx_max_bw;
+        __le16  reserved1[2];
+
+        u8      mac[ETH_ALEN];
+        u8      reserved2[106];
+};
+
+struct qlcnic_eswitch {
+        u8      port;
+        u8      active_vports;
+        u8      active_vlans;
+        u8      active_ucast_filters;
+        u8      max_ucast_filters;
+        u8      max_active_vlans;
+
+        u32     flags;
+#define QLCNIC_SWITCH_ENABLE            BIT_1
+#define QLCNIC_SWITCH_VLAN_FILTERING    BIT_2
+#define QLCNIC_SWITCH_PROMISC_MODE      BIT_3
+#define QLCNIC_SWITCH_PORT_MIRRORING    BIT_4
+};
+
 int qlcnic_fw_cmd_query_phy(struct qlcnic_adapter *adapter, u32 reg, u32 *val);
 int qlcnic_fw_cmd_set_phy(struct qlcnic_adapter *adapter, u32 reg, u32 val);
 
@@ -1038,6 +1114,7 @@ void qlcnic_request_firmware(struct qlcnic_adapter *adapter);
 void qlcnic_release_firmware(struct qlcnic_adapter *adapter);
 int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter);
 int qlcnic_setup_idc_param(struct qlcnic_adapter *adapter);
+int qlcnic_check_flash_fw_ver(struct qlcnic_adapter *adapter);
 
 int qlcnic_rom_fast_read(struct qlcnic_adapter *adapter, int addr, int *valp);
 int qlcnic_rom_fast_read_words(struct qlcnic_adapter *adapter, int addr,
@@ -1070,13 +1147,14 @@ void qlcnic_advert_link_change(struct qlcnic_adapter *adapter, int linkup);
 int qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu);
 int qlcnic_change_mtu(struct net_device *netdev, int new_mtu);
 int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable);
-int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, int enable);
+int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable);
 int qlcnic_send_lro_cleanup(struct qlcnic_adapter *adapter);
 void qlcnic_update_cmd_producer(struct qlcnic_adapter *adapter,
                 struct qlcnic_host_tx_ring *tx_ring);
-int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u64 *mac);
+int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u8 *mac);
 void qlcnic_clear_ilb_mode(struct qlcnic_adapter *adapter);
 int qlcnic_set_ilb_mode(struct qlcnic_adapter *adapter);
+void qlcnic_fetch_mac(struct qlcnic_adapter *, u32, u32, u8, u8 *);
 
 /* Functions from qlcnic_main.c */
 int qlcnic_reset_context(struct qlcnic_adapter *);
@@ -1088,6 +1166,25 @@ int qlcnic_check_loopback_buff(unsigned char *data);
 netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
 void qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring);
 
+/* Management functions */
+int qlcnic_set_mac_address(struct qlcnic_adapter *, u8*);
+int qlcnic_get_mac_address(struct qlcnic_adapter *, u8*);
+int qlcnic_get_nic_info(struct qlcnic_adapter *, u8);
+int qlcnic_set_nic_info(struct qlcnic_adapter *, struct qlcnic_info *);
+int qlcnic_get_pci_info(struct qlcnic_adapter *);
+int qlcnic_reset_partition(struct qlcnic_adapter *, u8);
+
+/*  eSwitch management functions */
+int qlcnic_get_eswitch_capabilities(struct qlcnic_adapter *, u8,
+                                struct qlcnic_eswitch *);
+int qlcnic_get_eswitch_status(struct qlcnic_adapter *, u8,
+                                struct qlcnic_eswitch *);
+int qlcnic_toggle_eswitch(struct qlcnic_adapter *, u8, u8);
+int qlcnic_config_switch_port(struct qlcnic_adapter *, u8, int, u8, u8,
+                        u8, u8, u16);
+int qlcnic_config_port_mirroring(struct qlcnic_adapter *, u8, u8, u8);
+extern int qlcnic_config_tso;
+
 /*
  * QLOGIC Board information
  */
@@ -1131,6 +1228,15 @@ static inline u32 qlcnic_tx_avail(struct qlcnic_host_tx_ring *tx_ring)
 
 extern const struct ethtool_ops qlcnic_ethtool_ops;
 
+struct qlcnic_nic_template {
+        int (*get_mac_addr) (struct qlcnic_adapter *, u8*);
+        int (*config_bridged_mode) (struct qlcnic_adapter *, u32);
+        int (*config_led) (struct qlcnic_adapter *, u32, u32);
+        int (*set_ilb_mode) (struct qlcnic_adapter *);
+        void (*clear_ilb_mode) (struct qlcnic_adapter *);
+        int (*start_firmware) (struct qlcnic_adapter *);
+};
+
 #define QLCDB(adapter, lvl, _fmt, _args...) do {        \
         if (NETIF_MSG_##lvl & adapter->msg_enable)      \
                 printk(KERN_INFO "%s: %s: " _fmt,       \
diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c
index c2c1f5cc16c..7c96c8e06c3 100644
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/qlcnic/qlcnic_ctx.c
@@ -88,12 +88,12 @@ qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu)
 
         if (recv_ctx->state == QLCNIC_HOST_CTX_STATE_ACTIVE) {
                 if (qlcnic_issue_cmd(adapter,
-                                adapter->ahw.pci_func,
-                                QLCHAL_VERSION,
-                                recv_ctx->context_id,
-                                mtu,
-                                0,
-                                QLCNIC_CDRP_CMD_SET_MTU)) {
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        recv_ctx->context_id,
+                        mtu,
+                        0,
+                        QLCNIC_CDRP_CMD_SET_MTU)) {
 
                         dev_err(&adapter->pdev->dev, "Failed to set mtu\n");
                         return -EIO;
@@ -121,7 +121,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
 
         int i, nrds_rings, nsds_rings;
         size_t rq_size, rsp_size;
-        u32 cap, reg, val;
+        u32 cap, reg, val, reg2;
         int err;
 
         struct qlcnic_recv_context *recv_ctx = &adapter->recv_ctx;
@@ -152,9 +152,14 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
 
         prq->host_rsp_dma_addr = cpu_to_le64(cardrsp_phys_addr);
 
-        cap = (QLCNIC_CAP0_LEGACY_CONTEXT | QLCNIC_CAP0_LEGACY_MN);
+        cap = (QLCNIC_CAP0_LEGACY_CONTEXT | QLCNIC_CAP0_LEGACY_MN
+                                                | QLCNIC_CAP0_VALIDOFF);
         cap |= (QLCNIC_CAP0_JUMBO_CONTIGUOUS | QLCNIC_CAP0_LRO_CONTIGUOUS);
 
+        prq->valid_field_offset = offsetof(struct qlcnic_hostrq_rx_ctx,
+                                                         msix_handler);
+        prq->txrx_sds_binding = nsds_rings - 1;
+
         prq->capabilities[0] = cpu_to_le32(cap);
         prq->host_int_crb_mode =
                 cpu_to_le32(QLCNIC_HOST_INT_CRB_MODE_SHARED);
@@ -197,7 +202,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
         phys_addr = hostrq_phys_addr;
         err = qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         (u32)(phys_addr >> 32),
                         (u32)(phys_addr & 0xffffffff),
                         rq_size,
@@ -216,8 +221,12 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
                 rds_ring = &recv_ctx->rds_rings[i];
 
                 reg = le32_to_cpu(prsp_rds[i].host_producer_crb);
-                rds_ring->crb_rcv_producer = qlcnic_get_ioaddr(adapter,
+                if (adapter->fw_hal_version == QLCNIC_FW_BASE)
+                        rds_ring->crb_rcv_producer = qlcnic_get_ioaddr(adapter,
                                 QLCNIC_REG(reg - 0x200));
+                else
+                        rds_ring->crb_rcv_producer = adapter->ahw.pci_base0 +
+                                reg;
         }
 
         prsp_sds = ((struct qlcnic_cardrsp_sds_ring *)
@@ -227,12 +236,18 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
                 sds_ring = &recv_ctx->sds_rings[i];
 
                 reg = le32_to_cpu(prsp_sds[i].host_consumer_crb);
-                sds_ring->crb_sts_consumer = qlcnic_get_ioaddr(adapter,
-                                QLCNIC_REG(reg - 0x200));
+                reg2 = le32_to_cpu(prsp_sds[i].interrupt_crb);
 
-                reg = le32_to_cpu(prsp_sds[i].interrupt_crb);
-                sds_ring->crb_intr_mask = qlcnic_get_ioaddr(adapter,
+                if (adapter->fw_hal_version == QLCNIC_FW_BASE) {
+                        sds_ring->crb_sts_consumer = qlcnic_get_ioaddr(adapter,
                                 QLCNIC_REG(reg - 0x200));
+                        sds_ring->crb_intr_mask = qlcnic_get_ioaddr(adapter,
+                                QLCNIC_REG(reg2 - 0x200));
+                } else {
+                        sds_ring->crb_sts_consumer = adapter->ahw.pci_base0 +
+                                reg;
+                        sds_ring->crb_intr_mask = adapter->ahw.pci_base0 + reg2;
+                }
         }
 
         recv_ctx->state = le32_to_cpu(prsp->host_ctx_state);
@@ -253,7 +268,7 @@ qlcnic_fw_cmd_destroy_rx_ctx(struct qlcnic_adapter *adapter)
 
         if (qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         recv_ctx->context_id,
                         QLCNIC_DESTROY_CTX_RESET,
                         0,
@@ -319,7 +334,7 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
         phys_addr = rq_phys_addr;
         err = qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         (u32)(phys_addr >> 32),
                         ((u32)phys_addr & 0xffffffff),
                         rq_size,
@@ -327,8 +342,12 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
 
         if (err == QLCNIC_RCODE_SUCCESS) {
                 temp = le32_to_cpu(prsp->cds_ring.host_producer_crb);
-                tx_ring->crb_cmd_producer = qlcnic_get_ioaddr(adapter,
+                if (adapter->fw_hal_version == QLCNIC_FW_BASE)
+                        tx_ring->crb_cmd_producer = qlcnic_get_ioaddr(adapter,
                                 QLCNIC_REG(temp - 0x200));
+                else
+                        tx_ring->crb_cmd_producer = adapter->ahw.pci_base0 +
+                                temp;
 
                 adapter->tx_context_id =
                         le16_to_cpu(prsp->context_id);
@@ -351,7 +370,7 @@ qlcnic_fw_cmd_destroy_tx_ctx(struct qlcnic_adapter *adapter)
 {
         if (qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         adapter->tx_context_id,
                         QLCNIC_DESTROY_CTX_RESET,
                         0,
@@ -368,7 +387,7 @@ qlcnic_fw_cmd_query_phy(struct qlcnic_adapter *adapter, u32 reg, u32 *val)
 
         if (qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         reg,
                         0,
                         0,
@@ -385,7 +404,7 @@ qlcnic_fw_cmd_set_phy(struct qlcnic_adapter *adapter, u32 reg, u32 val)
 {
         return qlcnic_issue_cmd(adapter,
                         adapter->ahw.pci_func,
-                        QLCHAL_VERSION,
+                        adapter->fw_hal_version,
                         reg,
                         val,
                         0,
@@ -533,3 +552,468 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
         }
 }
 
+/* Set MAC address of a NIC partition */
+int qlcnic_set_mac_address(struct qlcnic_adapter *adapter, u8* mac)
+{
+        int err = 0;
+        u32 arg1, arg2, arg3;
+
+        arg1 = adapter->ahw.pci_func | BIT_9;
+        arg2 = mac[0] | (mac[1] << 8) | (mac[2] << 16) | (mac[3] << 24);
+        arg3 = mac[4] | (mac[5] << 16);
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        arg2,
+                        arg3,
+                        QLCNIC_CDRP_CMD_MAC_ADDRESS);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to set mac address%d\n", err);
+                err = -EIO;
+        }
+
+        return err;
+}
+
+/* Get MAC address of a NIC partition */
+int qlcnic_get_mac_address(struct qlcnic_adapter *adapter, u8 *mac)
+{
+        int err;
+        u32 arg1;
+
+        arg1 = adapter->ahw.pci_func | BIT_8;
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_MAC_ADDRESS);
+
+        if (err == QLCNIC_RCODE_SUCCESS)
+                qlcnic_fetch_mac(adapter, QLCNIC_ARG1_CRB_OFFSET,
+                                QLCNIC_ARG2_CRB_OFFSET, 0, mac);
+        else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get mac address%d\n", err);
+                err = -EIO;
+        }
+
+        return err;
+}
+
+/* Get info of a NIC partition */
+int qlcnic_get_nic_info(struct qlcnic_adapter *adapter, u8 func_id)
+{
+        int     err;
+        dma_addr_t nic_dma_t;
+        struct qlcnic_info *nic_info;
+        void *nic_info_addr;
+        size_t  nic_size = sizeof(struct qlcnic_info);
+
+        nic_info_addr = pci_alloc_consistent(adapter->pdev,
+                nic_size, &nic_dma_t);
+        if (!nic_info_addr)
+                return -ENOMEM;
+        memset(nic_info_addr, 0, nic_size);
+
+        nic_info = (struct qlcnic_info *) nic_info_addr;
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        MSD(nic_dma_t),
+                        LSD(nic_dma_t),
+                        (func_id << 16 | nic_size),
+                        QLCNIC_CDRP_CMD_GET_NIC_INFO);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                adapter->physical_port = le16_to_cpu(nic_info->phys_port);
+                adapter->switch_mode = le16_to_cpu(nic_info->switch_mode);
+                adapter->max_tx_ques = le16_to_cpu(nic_info->max_tx_ques);
+                adapter->max_rx_ques = le16_to_cpu(nic_info->max_rx_ques);
+                adapter->min_tx_bw = le16_to_cpu(nic_info->min_tx_bw);
+                adapter->max_tx_bw = le16_to_cpu(nic_info->max_tx_bw);
+                adapter->max_mtu = le16_to_cpu(nic_info->max_mtu);
+                adapter->capabilities = le32_to_cpu(nic_info->capabilities);
+                adapter->max_mac_filters = nic_info->max_mac_filters;
+
+                if (adapter->capabilities & BIT_6)
+                        adapter->flags |= QLCNIC_ESWITCH_ENABLED;
+                else
+                        adapter->flags &= ~QLCNIC_ESWITCH_ENABLED;
+
+                dev_info(&adapter->pdev->dev,
+                        "phy port: %d switch_mode: %d,\n"
+                        "\tmax_tx_q: %d max_rx_q: %d min_tx_bw: 0x%x,\n"
+                        "\tmax_tx_bw: 0x%x max_mtu:0x%x, capabilities: 0x%x\n",
+                        adapter->physical_port, adapter->switch_mode,
+                        adapter->max_tx_ques, adapter->max_rx_ques,
+                        adapter->min_tx_bw, adapter->max_tx_bw,
+                        adapter->max_mtu, adapter->capabilities);
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get nic info%d\n", err);
+                err = -EIO;
+        }
+
+        pci_free_consistent(adapter->pdev, nic_size, nic_info_addr, nic_dma_t);
+        return err;
+}
+
+/* Configure a NIC partition */
+int qlcnic_set_nic_info(struct qlcnic_adapter *adapter, struct qlcnic_info *nic)
+{
+        int err = -EIO;
+        u32 func_state;
+        dma_addr_t nic_dma_t;
+        void *nic_info_addr;
+        struct qlcnic_info *nic_info;
+        size_t nic_size = sizeof(struct qlcnic_info);
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        if (qlcnic_api_lock(adapter))
+                return err;
+
+        func_state = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT);
+        if (QLC_DEV_CHECK_ACTIVE(func_state, nic->pci_func)) {
+                qlcnic_api_unlock(adapter);
+                return err;
+        }
+
+        qlcnic_api_unlock(adapter);
+
+        nic_info_addr = pci_alloc_consistent(adapter->pdev, nic_size,
+                        &nic_dma_t);
+        if (!nic_info_addr)
+                return -ENOMEM;
+
+        memset(nic_info_addr, 0, nic_size);
+        nic_info = (struct qlcnic_info *)nic_info_addr;
+
+        nic_info->pci_func = cpu_to_le16(nic->pci_func);
+        nic_info->op_mode = cpu_to_le16(nic->op_mode);
+        nic_info->phys_port = cpu_to_le16(nic->phys_port);
+        nic_info->switch_mode = cpu_to_le16(nic->switch_mode);
+        nic_info->capabilities = cpu_to_le32(nic->capabilities);
+        nic_info->max_mac_filters = nic->max_mac_filters;
+        nic_info->max_tx_ques = cpu_to_le16(nic->max_tx_ques);
+        nic_info->max_rx_ques = cpu_to_le16(nic->max_rx_ques);
+        nic_info->min_tx_bw = cpu_to_le16(nic->min_tx_bw);
+        nic_info->max_tx_bw = cpu_to_le16(nic->max_tx_bw);
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        MSD(nic_dma_t),
+                        LSD(nic_dma_t),
+                        nic_size,
+                        QLCNIC_CDRP_CMD_SET_NIC_INFO);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to set nic info%d\n", err);
+                err = -EIO;
+        }
+
+        pci_free_consistent(adapter->pdev, nic_size, nic_info_addr, nic_dma_t);
+        return err;
+}
+
+/* Get PCI Info of a partition */
+int qlcnic_get_pci_info(struct qlcnic_adapter *adapter)
+{
+        int err = 0, i;
+        dma_addr_t pci_info_dma_t;
+        struct qlcnic_pci_info *npar;
+        void *pci_info_addr;
+        size_t npar_size = sizeof(struct qlcnic_pci_info);
+        size_t pci_size = npar_size * QLCNIC_MAX_PCI_FUNC;
+
+        pci_info_addr = pci_alloc_consistent(adapter->pdev, pci_size,
+                        &pci_info_dma_t);
+        if (!pci_info_addr)
+                return -ENOMEM;
+        memset(pci_info_addr, 0, pci_size);
+
+        if (!adapter->npars)
+                adapter->npars = kzalloc(pci_size, GFP_KERNEL);
+        if (!adapter->npars) {
+                err = -ENOMEM;
+                goto err_npar;
+        }
+
+        if (!adapter->eswitch)
+                adapter->eswitch = kzalloc(sizeof(struct qlcnic_eswitch) *
+                                QLCNIC_NIU_MAX_XG_PORTS, GFP_KERNEL);
+        if (!adapter->eswitch) {
+                err = -ENOMEM;
+                goto err_eswitch;
+        }
+
+        npar = (struct qlcnic_pci_info *) pci_info_addr;
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        MSD(pci_info_dma_t),
+                        LSD(pci_info_dma_t),
+                        pci_size,
+                        QLCNIC_CDRP_CMD_GET_PCI_INFO);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++, npar++) {
+                        adapter->npars[i].id = le32_to_cpu(npar->id);
+                        adapter->npars[i].active = le32_to_cpu(npar->active);
+                        adapter->npars[i].type = le32_to_cpu(npar->type);
+                        adapter->npars[i].default_port =
+                                le32_to_cpu(npar->default_port);
+                        adapter->npars[i].tx_min_bw =
+                                le32_to_cpu(npar->tx_min_bw);
+                        adapter->npars[i].tx_max_bw =
+                                le32_to_cpu(npar->tx_max_bw);
+                        memcpy(adapter->npars[i].mac, npar->mac, ETH_ALEN);
+                }
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get PCI Info%d\n", err);
+                kfree(adapter->npars);
+                err = -EIO;
+        }
+        goto err_npar;
+
+err_eswitch:
+        kfree(adapter->npars);
+        adapter->npars = NULL;
+
+err_npar:
+        pci_free_consistent(adapter->pdev, pci_size, pci_info_addr,
+                pci_info_dma_t);
+        return err;
+}
+
+/* Reset a NIC partition */
+
+int qlcnic_reset_partition(struct qlcnic_adapter *adapter, u8 func_no)
+{
+        int err = -EIO;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        func_no,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_RESET_NPAR);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to issue reset partition%d\n", err);
+                err = -EIO;
+        }
+
+        return err;
+}
+
+/* Get eSwitch Capabilities */
+int qlcnic_get_eswitch_capabilities(struct qlcnic_adapter *adapter, u8 port,
+                                        struct qlcnic_eswitch *eswitch)
+{
+        int err = -EIO;
+        u32 arg1, arg2;
+
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC)
+                return err;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        port,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_GET_ESWITCH_CAPABILITY);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                arg1 = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
+                arg2 = QLCRD32(adapter, QLCNIC_ARG2_CRB_OFFSET);
+
+                eswitch->port = arg1 & 0xf;
+                eswitch->active_vports = LSB(arg2);
+                eswitch->max_ucast_filters = MSB(arg2);
+                eswitch->max_active_vlans = LSB(MSW(arg2));
+                if (arg1 & BIT_6)
+                        eswitch->flags |= QLCNIC_SWITCH_VLAN_FILTERING;
+                if (arg1 & BIT_7)
+                        eswitch->flags |= QLCNIC_SWITCH_PROMISC_MODE;
+                if (arg1 & BIT_8)
+                        eswitch->flags |= QLCNIC_SWITCH_PORT_MIRRORING;
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get eswitch capabilities%d\n", err);
+        }
+
+        return err;
+}
+
+/* Get current status of eswitch */
+int qlcnic_get_eswitch_status(struct qlcnic_adapter *adapter, u8 port,
+                                struct qlcnic_eswitch *eswitch)
+{
+        int err = -EIO;
+        u32 arg1, arg2;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        port,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_GET_ESWITCH_STATUS);
+
+        if (err == QLCNIC_RCODE_SUCCESS) {
+                arg1 = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
+                arg2 = QLCRD32(adapter, QLCNIC_ARG2_CRB_OFFSET);
+
+                eswitch->port = arg1 & 0xf;
+                eswitch->active_vports = LSB(arg2);
+                eswitch->active_ucast_filters = MSB(arg2);
+                eswitch->active_vlans = LSB(MSW(arg2));
+                if (arg1 & BIT_6)
+                        eswitch->flags |= QLCNIC_SWITCH_VLAN_FILTERING;
+                if (arg1 & BIT_8)
+                        eswitch->flags |= QLCNIC_SWITCH_PORT_MIRRORING;
+
+        } else {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to get eswitch status%d\n", err);
+        }
+
+        return err;
+}
+
+/* Enable/Disable eSwitch */
+int qlcnic_toggle_eswitch(struct qlcnic_adapter *adapter, u8 id, u8 enable)
+{
+        int err = -EIO;
+        u32 arg1, arg2;
+        struct qlcnic_eswitch *eswitch;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        eswitch = &adapter->eswitch[id];
+        if (!eswitch)
+                return err;
+
+        arg1 = eswitch->port | (enable ? BIT_4 : 0);
+        arg2 = eswitch->active_vports | (eswitch->max_ucast_filters << 8) |
+                (eswitch->max_active_vlans << 16);
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        arg2,
+                        0,
+                        QLCNIC_CDRP_CMD_TOGGLE_ESWITCH);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to enable eswitch%d\n", eswitch->port);
+                eswitch->flags &= ~QLCNIC_SWITCH_ENABLE;
+                err = -EIO;
+        } else {
+                eswitch->flags |= QLCNIC_SWITCH_ENABLE;
+                dev_info(&adapter->pdev->dev,
+                        "Enabled eSwitch for port %d\n", eswitch->port);
+        }
+
+        return err;
+}
+
+/* Configure eSwitch for port mirroring */
+int qlcnic_config_port_mirroring(struct qlcnic_adapter *adapter, u8 id,
+                                u8 enable_mirroring, u8 pci_func)
+{
+        int err = -EIO;
+        u32 arg1;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC ||
+                !(adapter->eswitch[id].flags & QLCNIC_SWITCH_ENABLE))
+                return err;
+
+        arg1 = id | (enable_mirroring ? BIT_4 : 0);
+        arg1 |= pci_func << 8;
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_SET_PORTMIRRORING);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to configure port mirroring%d on eswitch:%d\n",
+                        pci_func, id);
+        } else {
+                dev_info(&adapter->pdev->dev,
+                        "Configured eSwitch %d for port mirroring:%d\n",
+                        id, pci_func);
+        }
+
+        return err;
+}
+
+/* Configure eSwitch port */
+int qlcnic_config_switch_port(struct qlcnic_adapter *adapter, u8 id,
+                int vlan_tagging, u8 discard_tagged, u8 promsc_mode,
+                u8 mac_learn, u8 pci_func, u16 vlan_id)
+{
+        int err = -EIO;
+        u32 arg1;
+        struct qlcnic_eswitch *eswitch;
+
+        if (adapter->op_mode != QLCNIC_MGMT_FUNC)
+                return err;
+
+        eswitch = &adapter->eswitch[id];
+        if (!(eswitch->flags & QLCNIC_SWITCH_ENABLE))
+                return err;
+
+        arg1 = eswitch->port | (discard_tagged ? BIT_4 : 0);
+        arg1 |= (promsc_mode ? BIT_6 : 0) | (mac_learn ? BIT_7 : 0);
+        arg1 |= pci_func << 8;
+        if (vlan_tagging)
+                arg1 |= BIT_5 | (vlan_id << 16);
+
+        err = qlcnic_issue_cmd(adapter,
+                        adapter->ahw.pci_func,
+                        adapter->fw_hal_version,
+                        arg1,
+                        0,
+                        0,
+                        QLCNIC_CDRP_CMD_CONFIGURE_ESWITCH);
+
+        if (err != QLCNIC_RCODE_SUCCESS) {
+                dev_err(&adapter->pdev->dev,
+                        "Failed to configure eswitch port%d\n", eswitch->port);
+                eswitch->flags |= QLCNIC_SWITCH_ENABLE;
+        } else {
+                eswitch->flags &= ~QLCNIC_SWITCH_ENABLE;
+                dev_info(&adapter->pdev->dev,
+                        "Configured eSwitch for port %d\n", eswitch->port);
+        }
+
+        return err;
+}
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index 3bd514ec7e8..3e4822ad5a8 100644
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -683,13 +683,13 @@ static int qlcnic_loopback_test(struct net_device *netdev)
         if (ret)
                 goto clear_it;
 
-        ret = qlcnic_set_ilb_mode(adapter);
+        ret = adapter->nic_ops->set_ilb_mode(adapter);
         if (ret)
                 goto done;
 
         ret = qlcnic_do_ilb_test(adapter);
 
-        qlcnic_clear_ilb_mode(adapter);
+        adapter->nic_ops->clear_ilb_mode(adapter);
 
 done:
         qlcnic_diag_free_res(netdev, max_sds_rings);
@@ -715,7 +715,8 @@ static int qlcnic_irq_test(struct net_device *netdev)
 
         adapter->diag_cnt = 0;
         ret = qlcnic_issue_cmd(adapter, adapter->ahw.pci_func,
-                        QLCHAL_VERSION, adapter->portnum, 0, 0, 0x00000011);
+                        adapter->fw_hal_version, adapter->portnum,
+                        0, 0, 0x00000011);
         if (ret)
                 goto done;
 
@@ -834,7 +835,7 @@ static int qlcnic_blink_led(struct net_device *dev, u32 val)
         struct qlcnic_adapter *adapter = netdev_priv(dev);
         int ret;
 
-        ret = qlcnic_config_led(adapter, 1, 0xf);
+        ret = adapter->nic_ops->config_led(adapter, 1, 0xf);
         if (ret) {
                 dev_err(&adapter->pdev->dev,
                         "Failed to set LED blink state.\n");
@@ -843,7 +844,7 @@ static int qlcnic_blink_led(struct net_device *dev, u32 val)
 
         msleep_interruptible(val * 1000);
 
-        ret = qlcnic_config_led(adapter, 0, 0xf);
+        ret = adapter->nic_ops->config_led(adapter, 0, 0xf);
         if (ret) {
                 dev_err(&adapter->pdev->dev,
                         "Failed to reset LED blink state.\n");
diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/qlcnic/qlcnic_hdr.h
index ad9d167723c..7b81cab2700 100644
--- a/drivers/net/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/qlcnic/qlcnic_hdr.h
@@ -208,6 +208,39 @@ enum {
         QLCNIC_HW_PX_MAP_CRB_PGR0
 };
 
+#define BIT_0   0x1
+#define BIT_1   0x2
+#define BIT_2   0x4
+#define BIT_3   0x8
+#define BIT_4   0x10
+#define BIT_5   0x20
+#define BIT_6   0x40
+#define BIT_7   0x80
+#define BIT_8   0x100
+#define BIT_9   0x200
+#define BIT_10  0x400
+#define BIT_11  0x800
+#define BIT_12  0x1000
+#define BIT_13  0x2000
+#define BIT_14  0x4000
+#define BIT_15  0x8000
+#define BIT_16  0x10000
+#define BIT_17  0x20000
+#define BIT_18  0x40000
+#define BIT_19  0x80000
+#define BIT_20  0x100000
+#define BIT_21  0x200000
+#define BIT_22  0x400000
+#define BIT_23  0x800000
+#define BIT_24  0x1000000
+#define BIT_25  0x2000000
+#define BIT_26  0x4000000
+#define BIT_27  0x8000000
+#define BIT_28  0x10000000
+#define BIT_29  0x20000000
+#define BIT_30  0x40000000
+#define BIT_31  0x80000000
+
 /*  This field defines CRB adr [31:20] of the agents */
 
 #define QLCNIC_HW_CRB_HUB_AGT_ADR_MN    \
@@ -668,10 +701,11 @@ enum {
 #define QLCNIC_CRB_DEV_REF_COUNT        (QLCNIC_CAM_RAM(0x138))
 #define QLCNIC_CRB_DEV_STATE            (QLCNIC_CAM_RAM(0x140))
 
-#define QLCNIC_CRB_DRV_STATE               (QLCNIC_CAM_RAM(0x144))
-#define QLCNIC_CRB_DRV_SCRATCH             (QLCNIC_CAM_RAM(0x148))
-#define QLCNIC_CRB_DEV_PARTITION_INFO      (QLCNIC_CAM_RAM(0x14c))
+#define QLCNIC_CRB_DRV_STATE            (QLCNIC_CAM_RAM(0x144))
+#define QLCNIC_CRB_DRV_SCRATCH          (QLCNIC_CAM_RAM(0x148))
+#define QLCNIC_CRB_DEV_PARTITION_INFO   (QLCNIC_CAM_RAM(0x14c))
 #define QLCNIC_CRB_DRV_IDC_VER          (QLCNIC_CAM_RAM(0x174))
+#define QLCNIC_CRB_DEV_NPAR_STATE       (QLCNIC_CAM_RAM(0x19c))
 #define QLCNIC_ROM_DEV_INIT_TIMEOUT     (0x3e885c)
 #define QLCNIC_ROM_DRV_RESET_TIMEOUT    (0x3e8860)
 
@@ -684,15 +718,26 @@ enum {
 #define QLCNIC_DEV_FAILED               0x6
 #define QLCNIC_DEV_QUISCENT             0x7
 
+#define QLCNIC_DEV_NPAR_NOT_RDY 0
+#define QLCNIC_DEV_NPAR_RDY             1
+
+#define QLC_DEV_CHECK_ACTIVE(VAL, FN)           ((VAL) &= (1 << (FN * 4)))
 #define QLC_DEV_SET_REF_CNT(VAL, FN)            ((VAL) |= (1 << (FN * 4)))
 #define QLC_DEV_CLR_REF_CNT(VAL, FN)            ((VAL) &= ~(1 << (FN * 4)))
 #define QLC_DEV_SET_RST_RDY(VAL, FN)            ((VAL) |= (1 << (FN * 4)))
 #define QLC_DEV_SET_QSCNT_RDY(VAL, FN)          ((VAL) |= (2 << (FN * 4)))
 #define QLC_DEV_CLR_RST_QSCNT(VAL, FN)          ((VAL) &= ~(3 << (FN * 4)))
 
+#define QLC_DEV_GET_DRV(VAL, FN)                (0xf & ((VAL) >> (FN * 4)))
+#define QLC_DEV_SET_DRV(VAL, FN)                ((VAL) << (FN * 4))
+
+#define QLCNIC_TYPE_NIC         1
+#define QLCNIC_TYPE_FCOE                2
+#define QLCNIC_TYPE_ISCSI               3
+
 #define QLCNIC_RCODE_DRIVER_INFO                0x20000000
-#define QLCNIC_RCODE_DRIVER_CAN_RELOAD          0x40000000
-#define QLCNIC_RCODE_FATAL_ERROR                0x80000000
+#define QLCNIC_RCODE_DRIVER_CAN_RELOAD          BIT_30
+#define QLCNIC_RCODE_FATAL_ERROR                BIT_31
 #define QLCNIC_FWERROR_PEGNUM(code)             ((code) & 0xff)
 #define QLCNIC_FWERROR_CODE(code)               ((code >> 8) & 0xfffff)
 
@@ -721,6 +766,35 @@ struct qlcnic_legacy_intr_set {
         u32     pci_int_reg;
 };
 
+#define QLCNIC_FW_API           0x1b216c
+#define QLCNIC_DRV_OP_MODE      0x1b2170
+#define QLCNIC_MSIX_BASE        0x132110
+#define QLCNIC_MAX_PCI_FUNC     8
+
+/* PCI function operational mode */
+enum {
+        QLCNIC_MGMT_FUNC        = 0,
+        QLCNIC_PRIV_FUNC        = 1,
+        QLCNIC_NON_PRIV_FUNC    = 2
+};
+
+/* FW HAL api version */
+enum {
+        QLCNIC_FW_BASE  = 1,
+        QLCNIC_FW_NPAR  = 2
+};
+
+#define QLC_DEV_DRV_DEFAULT 0x11111111
+
+#define LSB(x)  ((uint8_t)(x))
+#define MSB(x)  ((uint8_t)((uint16_t)(x) >> 8))
+
+#define LSW(x)  ((uint16_t)((uint32_t)(x)))
+#define MSW(x)  ((uint16_t)((uint32_t)(x) >> 16))
+
+#define LSD(x)  ((uint32_t)((uint64_t)(x)))
+#define MSD(x)  ((uint32_t)((((uint64_t)(x)) >> 16) >> 16))
+
 #define QLCNIC_LEGACY_INTR_CONFIG                                       \
 {                                                                       \
         {                                                               \
diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/qlcnic/qlcnic_hw.c
index 0c2e1f08f45..10ba72302fc 100644
--- a/drivers/net/qlcnic/qlcnic_hw.c
+++ b/drivers/net/qlcnic/qlcnic_hw.c
@@ -338,9 +338,15 @@ qlcnic_send_cmd_descs(struct qlcnic_adapter *adapter,
 
         if (nr_desc >= qlcnic_tx_avail(tx_ring)) {
                 netif_tx_stop_queue(tx_ring->txq);
-                __netif_tx_unlock_bh(tx_ring->txq);
-                adapter->stats.xmit_off++;
-                return -EBUSY;
+                smp_mb();
+                if (qlcnic_tx_avail(tx_ring) > nr_desc) {
+                        if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH)
+                                netif_tx_wake_queue(tx_ring->txq);
+                } else {
+                        adapter->stats.xmit_off++;
+                        __netif_tx_unlock_bh(tx_ring->txq);
+                        return -EBUSY;
+                }
         }
 
         do {
@@ -538,7 +544,7 @@ int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable)
         return rv;
 }
 
-int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, int enable)
+int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
 {
         struct qlcnic_nic_req req;
         u64 word;
@@ -704,21 +710,15 @@ int qlcnic_change_mtu(struct net_device *netdev, int mtu)
         return rc;
 }
 
-int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u64 *mac)
+int qlcnic_get_mac_addr(struct qlcnic_adapter *adapter, u8 *mac)
 {
-        u32 crbaddr, mac_hi, mac_lo;
+        u32 crbaddr;
         int pci_func = adapter->ahw.pci_func;
 
         crbaddr = CRB_MAC_BLOCK_START +
                 (4 * ((pci_func/2) * 3)) + (4 * (pci_func & 1));
 
-        mac_lo = QLCRD32(adapter, crbaddr);
-        mac_hi = QLCRD32(adapter, crbaddr+4);
-
-        if (pci_func & 1)
-                *mac = le64_to_cpu((mac_lo >> 16) | ((u64)mac_hi << 16));
-        else
-                *mac = le64_to_cpu((u64)mac_lo | ((u64)mac_hi << 32));
+        qlcnic_fetch_mac(adapter, crbaddr, crbaddr+4, pci_func & 1, mac);
 
         return 0;
 }
@@ -766,7 +766,7 @@ qlcnic_pci_get_crb_addr_2M(struct qlcnic_adapter *adapter,
  * Out: 'off' is 2M pci map addr
  * side effect: lock crb window
  */
-static void
+static int
 qlcnic_pci_set_crbwindow_2M(struct qlcnic_adapter *adapter, ulong off)
 {
         u32 window;
@@ -775,6 +775,10 @@ qlcnic_pci_set_crbwindow_2M(struct qlcnic_adapter *adapter, ulong off)
         off -= QLCNIC_PCI_CRBSPACE;
 
         window = CRB_HI(off);
+        if (window == 0) {
+                dev_err(&adapter->pdev->dev, "Invalid offset 0x%lx\n", off);
+                return -EIO;
+        }
 
         writel(window, addr);
         if (readl(addr) != window) {
@@ -782,7 +786,9 @@ qlcnic_pci_set_crbwindow_2M(struct qlcnic_adapter *adapter, ulong off)
                         dev_warn(&adapter->pdev->dev,
                                 "failed to set CRB window to %d off 0x%lx\n",
                                 window, off);
+                return -EIO;
         }
+        return 0;
 }
 
 int
@@ -803,11 +809,12 @@ qlcnic_hw_write_wx_2M(struct qlcnic_adapter *adapter, ulong off, u32 data)
                 /* indirect access */
                 write_lock_irqsave(&adapter->ahw.crb_lock, flags);
                 crb_win_lock(adapter);
-                qlcnic_pci_set_crbwindow_2M(adapter, off);
-                writel(data, addr);
+                rv = qlcnic_pci_set_crbwindow_2M(adapter, off);
+                if (!rv)
+                        writel(data, addr);
                 crb_win_unlock(adapter);
                 write_unlock_irqrestore(&adapter->ahw.crb_lock, flags);
-                return 0;
+                return rv;
         }
 
         dev_err(&adapter->pdev->dev,
@@ -821,7 +828,7 @@ qlcnic_hw_read_wx_2M(struct qlcnic_adapter *adapter, ulong off)
 {
         unsigned long flags;
         int rv;
-        u32 data;
+        u32 data = -1;
         void __iomem *addr = NULL;
 
         rv = qlcnic_pci_get_crb_addr_2M(adapter, off, &addr);
@@ -833,8 +840,8 @@ qlcnic_hw_read_wx_2M(struct qlcnic_adapter *adapter, ulong off)
                 /* indirect access */
                 write_lock_irqsave(&adapter->ahw.crb_lock, flags);
                 crb_win_lock(adapter);
-                qlcnic_pci_set_crbwindow_2M(adapter, off);
-                data = readl(addr);
+                if (!qlcnic_pci_set_crbwindow_2M(adapter, off))
+                        data = readl(addr);
                 crb_win_unlock(adapter);
                 write_unlock_irqrestore(&adapter->ahw.crb_lock, flags);
                 return data;
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index 71a4e664ad7..058ce61501c 100644
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/qlcnic/qlcnic_init.c
@@ -181,7 +181,9 @@ skip_rds:
 
         tx_ring = adapter->tx_ring;
         vfree(tx_ring->cmd_buf_arr);
+        tx_ring->cmd_buf_arr = NULL;
         kfree(adapter->tx_ring);
+        adapter->tx_ring = NULL;
 }
 
 int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter)
@@ -413,7 +415,7 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)
 
         /* resetall */
         qlcnic_rom_lock(adapter);
-        QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xffffffff);
+        QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xfeffffff);
         qlcnic_rom_unlock(adapter);
 
         if (qlcnic_rom_fast_read(adapter, 0, &n) != 0 || (n != 0xcafecafe) ||
@@ -520,17 +522,16 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) {
         int timeo;
         u32 val;
 
-        val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO);
-        val = (val >> (adapter->portnum * 4)) & 0xf;
-
-        if ((val & 0x3) != 1) {
-                dev_err(&adapter->pdev->dev, "Not an Ethernet NIC func=%u\n",
-                                                                        val);
-                return -EIO;
+        if (adapter->fw_hal_version == QLCNIC_FW_BASE) {
+                val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO);
+                val = QLC_DEV_GET_DRV(val, adapter->portnum);
+                if ((val & 0x3) != QLCNIC_TYPE_NIC) {
+                        dev_err(&adapter->pdev->dev,
+                                "Not an Ethernet NIC func=%u\n", val);
+                        return -EIO;
+                }
+                adapter->physical_port = (val >> 2);
         }
-
-        adapter->physical_port = (val >> 2);
-
         if (qlcnic_rom_fast_read(adapter, QLCNIC_ROM_DEV_INIT_TIMEOUT, &timeo))
                 timeo = 30;
 
@@ -544,16 +545,34 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) {
         return 0;
 }
 
+int
+qlcnic_check_flash_fw_ver(struct qlcnic_adapter *adapter)
+{
+        u32 ver = -1, min_ver;
+
+        qlcnic_rom_fast_read(adapter, QLCNIC_FW_VERSION_OFFSET, (int *)&ver);
+
+        ver = QLCNIC_DECODE_VERSION(ver);
+        min_ver = QLCNIC_MIN_FW_VERSION;
+
+        if (ver < min_ver) {
+                dev_err(&adapter->pdev->dev,
+                        "firmware version %d.%d.%d unsupported."
+                        "Min supported version %d.%d.%d\n",
+                        _major(ver), _minor(ver), _build(ver),
+                        _major(min_ver), _minor(min_ver), _build(min_ver));
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int
 qlcnic_has_mn(struct qlcnic_adapter *adapter)
 {
-        u32 capability, flashed_ver;
+        u32 capability;
         capability = 0;
 
-        qlcnic_rom_fast_read(adapter,
-                        QLCNIC_FW_VERSION_OFFSET, (int *)&flashed_ver);
-        flashed_ver = QLCNIC_DECODE_VERSION(flashed_ver);
-
         capability = QLCRD32(adapter, QLCNIC_PEG_TUNE_CAPABILITY);
         if (capability & QLCNIC_PEG_TUNE_MN_PRESENT)
                 return 1;
@@ -1007,7 +1026,7 @@ static int
 qlcnic_validate_firmware(struct qlcnic_adapter *adapter)
 {
         __le32 val;
-        u32 ver, min_ver, bios, min_size;
+        u32 ver, bios, min_size;
         struct pci_dev *pdev = adapter->pdev;
         const struct firmware *fw = adapter->fw;
         u8 fw_type = adapter->fw_type;
@@ -1029,12 +1048,9 @@ qlcnic_validate_firmware(struct qlcnic_adapter *adapter)
                 return -EINVAL;
 
         val = qlcnic_get_fw_version(adapter);
-
-        min_ver = QLCNIC_VERSION_CODE(4, 0, 216);
-
         ver = QLCNIC_DECODE_VERSION(val);
 
-        if ((_major(ver) > _QLCNIC_LINUX_MAJOR) || (ver < min_ver)) {
+        if (ver < QLCNIC_MIN_FW_VERSION) {
                 dev_err(&pdev->dev,
                                 "%s: firmware version %d.%d.%d unsupported\n",
                 fw_name[fw_type], _major(ver), _minor(ver), _build(ver));
@@ -1701,3 +1717,24 @@ qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
         sds_ring->consumer = consumer;
         writel(consumer, sds_ring->crb_sts_consumer);
 }
+
+void
+qlcnic_fetch_mac(struct qlcnic_adapter *adapter, u32 off1, u32 off2,
+                        u8 alt_mac, u8 *mac)
+{
+        u32 mac_low, mac_high;
+        int i;
+
+        mac_low = QLCRD32(adapter, off1);
+        mac_high = QLCRD32(adapter, off2);
+
+        if (alt_mac) {
+                mac_low |= (mac_low >> 16) | (mac_high << 16);
+                mac_high >>= 16;
+        }
+
+        for (i = 0; i < 2; i++)
+                mac[i] = (u8)(mac_high >> ((1 - i) * 8));
+        for (i = 2; i < 6; i++)
+                mac[i] = (u8)(mac_low >> ((5 - i) * 8));
+}
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 1003eb76fda..655bccd7f8f 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -35,14 +35,14 @@
 #include <linux/inetdevice.h>
 #include <linux/sysfs.h>
 
-MODULE_DESCRIPTION("QLogic 10 GbE Converged Ethernet Driver");
+MODULE_DESCRIPTION("QLogic 1/10 GbE Converged/Intelligent Ethernet Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(QLCNIC_LINUX_VERSIONID);
 MODULE_FIRMWARE(QLCNIC_UNIFIED_ROMIMAGE_NAME);
 
 char qlcnic_driver_name[] = "qlcnic";
-static const char qlcnic_driver_string[] = "QLogic Converged Ethernet Driver v"
-    QLCNIC_LINUX_VERSIONID;
+static const char qlcnic_driver_string[] = "QLogic 1/10 GbE "
+        "Converged/Intelligent Ethernet Driver v" QLCNIC_LINUX_VERSIONID;
 
 static int port_mode = QLCNIC_PORT_MODE_AUTO_NEG;
 
@@ -65,6 +65,10 @@ static int load_fw_file;
 module_param(load_fw_file, int, 0644);
 MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file");
 
+static int qlcnic_config_npars;
+module_param(qlcnic_config_npars, int, 0644);
+MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled");
+
 static int __devinit qlcnic_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent);
 static void __devexit qlcnic_remove(struct pci_dev *pdev);
@@ -79,6 +83,7 @@ static void qlcnic_schedule_work(struct qlcnic_adapter *adapter,
                 work_func_t func, int delay);
 static void qlcnic_cancel_fw_work(struct qlcnic_adapter *adapter);
 static int qlcnic_poll(struct napi_struct *napi, int budget);
+static int qlcnic_rx_poll(struct napi_struct *napi, int budget);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void qlcnic_poll_controller(struct net_device *netdev);
 #endif
@@ -99,7 +104,14 @@ static irqreturn_t qlcnic_msix_intr(int irq, void *data);
 
 static struct net_device_stats *qlcnic_get_stats(struct net_device *netdev);
 static void qlcnic_config_indev_addr(struct net_device *dev, unsigned long);
-
+static int qlcnic_start_firmware(struct qlcnic_adapter *);
+
+static void qlcnic_dev_set_npar_ready(struct qlcnic_adapter *);
+static void qlcnicvf_clear_ilb_mode(struct qlcnic_adapter *);
+static int qlcnicvf_set_ilb_mode(struct qlcnic_adapter *);
+static int qlcnicvf_config_led(struct qlcnic_adapter *, u32, u32);
+static int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *, u32);
+static int qlcnicvf_start_firmware(struct qlcnic_adapter *);
 /*  PCI Device ID Table  */
 #define ENTRY(device) \
         {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \
@@ -120,12 +132,6 @@ qlcnic_update_cmd_producer(struct qlcnic_adapter *adapter,
                 struct qlcnic_host_tx_ring *tx_ring)
 {
         writel(tx_ring->producer, tx_ring->crb_cmd_producer);
-
-        if (qlcnic_tx_avail(tx_ring) <= TX_STOP_THRESH) {
-                netif_stop_queue(adapter->netdev);
-                smp_mb();
-                adapter->stats.xmit_off++;
-        }
 }
 
 static const u32 msi_tgt_status[8] = {
@@ -184,8 +190,13 @@ qlcnic_napi_add(struct qlcnic_adapter *adapter, struct net_device *netdev)
 
         for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
-                netif_napi_add(netdev, &sds_ring->napi,
-                                qlcnic_poll, QLCNIC_NETDEV_WEIGHT);
+
+                if (ring == adapter->max_sds_rings - 1)
+                        netif_napi_add(netdev, &sds_ring->napi, qlcnic_poll,
+                                QLCNIC_NETDEV_WEIGHT/adapter->max_sds_rings);
+                else
+                        netif_napi_add(netdev, &sds_ring->napi,
+                                qlcnic_rx_poll, QLCNIC_NETDEV_WEIGHT*2);
         }
 
         return 0;
@@ -307,19 +318,14 @@ static void qlcnic_init_msix_entries(struct qlcnic_adapter *adapter, int count)
 static int
 qlcnic_read_mac_addr(struct qlcnic_adapter *adapter)
 {
-        int i;
-        unsigned char *p;
-        u64 mac_addr;
+        u8 mac_addr[ETH_ALEN];
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
 
-        if (qlcnic_get_mac_addr(adapter, &mac_addr) != 0)
+        if (adapter->nic_ops->get_mac_addr(adapter, mac_addr) != 0)
                 return -EIO;
 
-        p = (unsigned char *)&mac_addr;
-        for (i = 0; i < 6; i++)
-                netdev->dev_addr[i] = *(p + 5 - i);
-
+        memcpy(netdev->dev_addr, mac_addr, ETH_ALEN);
         memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
         memcpy(adapter->mac_addr, netdev->dev_addr, netdev->addr_len);
 
@@ -371,6 +377,33 @@ static const struct net_device_ops qlcnic_netdev_ops = {
 #endif
 };
 
+static struct qlcnic_nic_template qlcnic_ops = {
+        .get_mac_addr = qlcnic_get_mac_addr,
+        .config_bridged_mode = qlcnic_config_bridged_mode,
+        .config_led = qlcnic_config_led,
+        .set_ilb_mode = qlcnic_set_ilb_mode,
+        .clear_ilb_mode = qlcnic_clear_ilb_mode,
+        .start_firmware = qlcnic_start_firmware
+};
+
+static struct qlcnic_nic_template qlcnic_pf_ops = {
+        .get_mac_addr = qlcnic_get_mac_address,
+        .config_bridged_mode = qlcnic_config_bridged_mode,
+        .config_led = qlcnic_config_led,
+        .set_ilb_mode = qlcnic_set_ilb_mode,
+        .clear_ilb_mode = qlcnic_clear_ilb_mode,
+        .start_firmware = qlcnic_start_firmware
+};
+
+static struct qlcnic_nic_template qlcnic_vf_ops = {
+        .get_mac_addr = qlcnic_get_mac_address,
+        .config_bridged_mode = qlcnicvf_config_bridged_mode,
+        .config_led = qlcnicvf_config_led,
+        .set_ilb_mode = qlcnicvf_set_ilb_mode,
+        .clear_ilb_mode = qlcnicvf_clear_ilb_mode,
+        .start_firmware = qlcnicvf_start_firmware
+};
+
 static void
 qlcnic_setup_intr(struct qlcnic_adapter *adapter)
 {
@@ -453,6 +486,121 @@ qlcnic_cleanup_pci_map(struct qlcnic_adapter *adapter)
 }
 
 static int
+qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
+{
+        u8 id;
+        u32 ref_count;
+        int i, ret = 1;
+        u32 data = QLCNIC_MGMT_FUNC;
+        void __iomem *priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE;
+
+        /* If other drivers are not in use set their privilege level */
+        ref_count = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT);
+        ret = qlcnic_api_lock(adapter);
+        if (ret)
+                goto err_lock;
+        if (QLC_DEV_CLR_REF_CNT(ref_count, adapter->ahw.pci_func))
+                goto err_npar;
+
+        if (qlcnic_config_npars) {
+                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+                        id = adapter->npars[i].id;
+                        if (adapter->npars[i].type != QLCNIC_TYPE_NIC ||
+                                id == adapter->ahw.pci_func)
+                                continue;
+                        data |= (qlcnic_config_npars &
+                                        QLC_DEV_SET_DRV(0xf, id));
+                }
+        } else {
+                data = readl(priv_op);
+                data = (data & ~QLC_DEV_SET_DRV(0xf, adapter->ahw.pci_func)) |
+                        (QLC_DEV_SET_DRV(QLCNIC_MGMT_FUNC,
+                        adapter->ahw.pci_func));
+        }
+        writel(data, priv_op);
+err_npar:
+        qlcnic_api_unlock(adapter);
+err_lock:
+        return ret;
+}
+
+static u32
+qlcnic_get_driver_mode(struct qlcnic_adapter *adapter)
+{
+        void __iomem *msix_base_addr;
+        void __iomem *priv_op;
+        u32 func;
+        u32 msix_base;
+        u32 op_mode, priv_level;
+
+        /* Determine FW API version */
+        adapter->fw_hal_version = readl(adapter->ahw.pci_base0 + QLCNIC_FW_API);
+        if (adapter->fw_hal_version == ~0) {
+                adapter->nic_ops = &qlcnic_ops;
+                adapter->fw_hal_version = QLCNIC_FW_BASE;
+                adapter->ahw.pci_func = PCI_FUNC(adapter->pdev->devfn);
+                adapter->capabilities = QLCRD32(adapter, CRB_FW_CAPABILITIES_1);
+                dev_info(&adapter->pdev->dev,
+                        "FW does not support nic partion\n");
+                return adapter->fw_hal_version;
+        }
+
+        /* Find PCI function number */
+        pci_read_config_dword(adapter->pdev, QLCNIC_MSIX_TABLE_OFFSET, &func);
+        msix_base_addr = adapter->ahw.pci_base0 + QLCNIC_MSIX_BASE;
+        msix_base = readl(msix_base_addr);
+        func = (func - msix_base)/QLCNIC_MSIX_TBL_PGSIZE;
+        adapter->ahw.pci_func = func;
+
+        qlcnic_get_nic_info(adapter, adapter->ahw.pci_func);
+
+        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
+                adapter->nic_ops = &qlcnic_ops;
+                return adapter->fw_hal_version;
+        }
+
+        /* Determine function privilege level */
+        priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE;
+        op_mode = readl(priv_op);
+        if (op_mode == QLC_DEV_DRV_DEFAULT)
+                priv_level = QLCNIC_MGMT_FUNC;
+        else
+                priv_level = QLC_DEV_GET_DRV(op_mode, adapter->ahw.pci_func);
+
+        switch (priv_level) {
+        case QLCNIC_MGMT_FUNC:
+                adapter->op_mode = QLCNIC_MGMT_FUNC;
+                adapter->nic_ops = &qlcnic_pf_ops;
+                qlcnic_get_pci_info(adapter);
+                /* Set privilege level for other functions */
+                qlcnic_set_function_modes(adapter);
+                dev_info(&adapter->pdev->dev,
+                        "HAL Version: %d, Management function\n",
+                        adapter->fw_hal_version);
+                break;
+        case QLCNIC_PRIV_FUNC:
+                adapter->op_mode = QLCNIC_PRIV_FUNC;
+                dev_info(&adapter->pdev->dev,
+                        "HAL Version: %d, Privileged function\n",
+                        adapter->fw_hal_version);
+                adapter->nic_ops = &qlcnic_pf_ops;
+                break;
+        case QLCNIC_NON_PRIV_FUNC:
+                adapter->op_mode = QLCNIC_NON_PRIV_FUNC;
+                dev_info(&adapter->pdev->dev,
+                        "HAL Version: %d Non Privileged function\n",
+                        adapter->fw_hal_version);
+                adapter->nic_ops = &qlcnic_vf_ops;
+                break;
+        default:
+                dev_info(&adapter->pdev->dev, "Unknown function mode: %d\n",
+                        priv_level);
+                return 0;
+        }
+        return adapter->fw_hal_version;
+}
+
+static int
 qlcnic_setup_pci_map(struct qlcnic_adapter *adapter)
 {
         void __iomem *mem_ptr0 = NULL;
@@ -460,7 +608,6 @@ qlcnic_setup_pci_map(struct qlcnic_adapter *adapter)
         unsigned long mem_len, pci_len0 = 0;
 
         struct pci_dev *pdev = adapter->pdev;
-        int pci_func = adapter->ahw.pci_func;
 
         /* remap phys address */
         mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */
@@ -483,8 +630,13 @@ qlcnic_setup_pci_map(struct qlcnic_adapter *adapter)
         adapter->ahw.pci_base0 = mem_ptr0;
         adapter->ahw.pci_len0 = pci_len0;
 
+        if (!qlcnic_get_driver_mode(adapter)) {
+                iounmap(adapter->ahw.pci_base0);
+                return -EIO;
+        }
+
         adapter->ahw.ocm_win_crb = qlcnic_get_ioaddr(adapter,
-                QLCNIC_PCIX_PS_REG(PCIX_OCM_WINDOW_REG(pci_func)));
+                QLCNIC_PCIX_PS_REG(PCIX_OCM_WINDOW_REG(adapter->ahw.pci_func)));
 
         return 0;
 }
@@ -509,7 +661,7 @@ static void get_brd_name(struct qlcnic_adapter *adapter, char *name)
         }
 
         if (!found)
-                name = "Unknown";
+                sprintf(name, "%pM Gigabit Ethernet", adapter->mac_addr);
 }
 
 static void
@@ -553,8 +705,6 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
         dev_info(&pdev->dev, "firmware v%d.%d.%d\n",
                         fw_major, fw_minor, fw_build);
 
-        adapter->capabilities = QLCRD32(adapter, CRB_FW_CAPABILITIES_1);
-
         adapter->flags &= ~QLCNIC_LRO_ENABLED;
 
         if (adapter->ahw.port_type == QLCNIC_XGBE) {
@@ -565,6 +715,8 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
                 adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_1G;
         }
 
+        qlcnic_get_nic_info(adapter, adapter->ahw.pci_func);
+
         adapter->msix_supported = !!use_msi_x;
         adapter->rss_supported = !!use_msi_x;
 
@@ -591,8 +743,12 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
 
         if (load_fw_file)
                 qlcnic_request_firmware(adapter);
-        else
+        else {
+                if (qlcnic_check_flash_fw_ver(adapter))
+                        goto err_out;
+
                 adapter->fw_type = QLCNIC_FLASH_ROMIMAGE;
+        }
 
         err = qlcnic_need_fw_reset(adapter);
         if (err < 0)
@@ -633,6 +789,10 @@ wait_init:
 
         qlcnic_check_options(adapter);
 
+        if (adapter->flags & QLCNIC_ESWITCH_ENABLED &&
+                adapter->op_mode != QLCNIC_NON_PRIV_FUNC)
+                qlcnic_dev_set_npar_ready(adapter);
+
         adapter->need_fw_reset = 0;
 
         qlcnic_release_firmware(adapter);
@@ -971,18 +1131,17 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
         adapter->max_mc_count = 38;
 
         netdev->netdev_ops         = &qlcnic_netdev_ops;
-        netdev->watchdog_timeo     = 2*HZ;
+        netdev->watchdog_timeo     = 5*HZ;
 
         qlcnic_change_mtu(netdev, netdev->mtu);
 
         SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_ops);
 
-        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
-        netdev->features |= (NETIF_F_GRO);
-        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM |
+                NETIF_F_IPV6_CSUM | NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6);
 
-        netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
-        netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM |
+                NETIF_F_IPV6_CSUM | NETIF_F_TSO | NETIF_F_TSO6);
 
         if (pci_using_dac) {
                 netdev->features |= NETIF_F_HIGHDMA;
@@ -1036,7 +1195,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct net_device *netdev = NULL;
         struct qlcnic_adapter *adapter = NULL;
         int err;
-        int pci_func_id = PCI_FUNC(pdev->devfn);
         uint8_t revision_id;
         uint8_t pci_using_dac;
 
@@ -1072,7 +1230,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->netdev  = netdev;
         adapter->pdev    = pdev;
         adapter->dev_rst_time = jiffies;
-        adapter->ahw.pci_func  = pci_func_id;
 
         revision_id = pdev->revision;
         adapter->ahw.revision_id = revision_id;
@@ -1088,7 +1245,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_free_netdev;
 
         /* This will be reset for mezz cards  */
-        adapter->portnum = pci_func_id;
+        adapter->portnum = adapter->ahw.pci_func;
 
         err = qlcnic_get_board_info(adapter);
         if (err) {
@@ -1102,7 +1259,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (qlcnic_setup_idc_param(adapter))
                 goto err_out_iounmap;
 
-        err = qlcnic_start_firmware(adapter);
+        err = adapter->nic_ops->start_firmware(adapter);
         if (err) {
                 dev_err(&pdev->dev, "Loading fw failed.Please Reboot\n");
                 goto err_out_decr_ref;
@@ -1175,6 +1332,11 @@ static void __devexit qlcnic_remove(struct pci_dev *pdev)
 
         qlcnic_detach(adapter);
 
+        if (adapter->npars != NULL)
+                kfree(adapter->npars);
+        if (adapter->eswitch != NULL)
+                kfree(adapter->eswitch);
+
         qlcnic_clr_all_drv_state(adapter);
 
         clear_bit(__QLCNIC_RESETTING, &adapter->state);
@@ -1263,7 +1425,7 @@ qlcnic_resume(struct pci_dev *pdev)
         pci_set_master(pdev);
         pci_restore_state(pdev);
 
-        err = qlcnic_start_firmware(adapter);
+        err = adapter->nic_ops->start_firmware(adapter);
         if (err) {
                 dev_err(&pdev->dev, "failed to start firmware\n");
                 return err;
@@ -1340,11 +1502,11 @@ qlcnic_tso_check(struct net_device *netdev,
         u8 opcode = TX_ETHER_PKT;
         __be16 protocol = skb->protocol;
         u16 flags = 0, vid = 0;
-        u32 producer;
         int copied, offset, copy_len, hdr_len = 0, tso = 0, vlan_oob = 0;
         struct cmd_desc_type0 *hwdesc;
         struct vlan_ethhdr *vh;
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        u32 producer = tx_ring->producer;
 
         if (protocol == cpu_to_be16(ETH_P_8021Q)) {
 
@@ -1360,6 +1522,11 @@ qlcnic_tso_check(struct net_device *netdev,
                 vlan_oob = 1;
         }
 
+        if (*(skb->data) & BIT_0) {
+                flags |= BIT_0;
+                memcpy(&first_desc->eth_addr, skb->data, ETH_ALEN);
+        }
+
         if ((netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
                         skb_shinfo(skb)->gso_size > 0) {
 
@@ -1409,7 +1576,6 @@ qlcnic_tso_check(struct net_device *netdev,
         /* For LSO, we need to copy the MAC/IP/TCP headers into
          * the descriptor ring
          */
-        producer = tx_ring->producer;
         copied = 0;
         offset = 2;
 
@@ -1537,10 +1703,15 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         /* 4 fragments per cmd des */
         no_of_desc = (frag_count + 3) >> 2;
 
-        if (unlikely(no_of_desc + 2 > qlcnic_tx_avail(tx_ring))) {
+        if (unlikely(qlcnic_tx_avail(tx_ring) <= TX_STOP_THRESH)) {
                 netif_stop_queue(netdev);
-                adapter->stats.xmit_off++;
-                return NETDEV_TX_BUSY;
+                smp_mb();
+                if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH)
+                        netif_start_queue(netdev);
+                else {
+                        adapter->stats.xmit_off++;
+                        return NETDEV_TX_BUSY;
+                }
         }
 
         producer = tx_ring->producer;
@@ -1846,14 +2017,12 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter)
                 smp_mb();
 
                 if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev)) {
-                        __netif_tx_lock(tx_ring->txq, smp_processor_id());
                         if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH) {
                                 netif_wake_queue(netdev);
-                                adapter->tx_timeo_cnt = 0;
                                 adapter->stats.xmit_on++;
                         }
-                        __netif_tx_unlock(tx_ring->txq);
                 }
+                adapter->tx_timeo_cnt = 0;
         }
         /*
          * If everything is freed up to consumer then check if the ring is full
@@ -1898,6 +2067,25 @@ static int qlcnic_poll(struct napi_struct *napi, int budget)
         return work_done;
 }
 
+static int qlcnic_rx_poll(struct napi_struct *napi, int budget)
+{
+        struct qlcnic_host_sds_ring *sds_ring =
+                container_of(napi, struct qlcnic_host_sds_ring, napi);
+
+        struct qlcnic_adapter *adapter = sds_ring->adapter;
+        int work_done;
+
+        work_done = qlcnic_process_rcv_ring(sds_ring, budget);
+
+        if (work_done < budget) {
+                napi_complete(&sds_ring->napi);
+                if (test_bit(__QLCNIC_DEV_UP, &adapter->state))
+                        qlcnic_enable_int(sds_ring);
+        }
+
+        return work_done;
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void qlcnic_poll_controller(struct net_device *netdev)
 {
@@ -2109,7 +2297,7 @@ qlcnic_fwinit_work(struct work_struct *work)
 {
         struct qlcnic_adapter *adapter = container_of(work,
                         struct qlcnic_adapter, fw_work.work);
-        u32 dev_state = 0xf;
+        u32 dev_state = 0xf, npar_state;
 
         if (qlcnic_api_lock(adapter))
                 goto err_ret;
@@ -2122,6 +2310,19 @@ qlcnic_fwinit_work(struct work_struct *work)
                 return;
         }
 
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
+                npar_state = QLCRD32(adapter, QLCNIC_CRB_DEV_NPAR_STATE);
+                if (npar_state == QLCNIC_DEV_NPAR_RDY) {
+                        qlcnic_api_unlock(adapter);
+                        goto wait_npar;
+                } else {
+                        qlcnic_schedule_work(adapter, qlcnic_fwinit_work,
+                                FW_POLL_DELAY);
+                        qlcnic_api_unlock(adapter);
+                        return;
+                }
+        }
+
         if (adapter->fw_wait_cnt++ > adapter->reset_ack_timeo) {
                 dev_err(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",
                                         adapter->reset_ack_timeo);
@@ -2154,7 +2355,7 @@ skip_ack_check:
 
                 qlcnic_api_unlock(adapter);
 
-                if (!qlcnic_start_firmware(adapter)) {
+                if (!adapter->nic_ops->start_firmware(adapter)) {
                         qlcnic_schedule_work(adapter, qlcnic_attach_work, 0);
                         return;
                 }
@@ -2163,6 +2364,7 @@ skip_ack_check:
 
         qlcnic_api_unlock(adapter);
 
+wait_npar:
         dev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
         QLCDB(adapter, HW, "Func waiting: Device state=%u\n", dev_state);
 
@@ -2177,7 +2379,7 @@ skip_ack_check:
                 break;
 
         default:
-                if (!qlcnic_start_firmware(adapter)) {
+                if (!adapter->nic_ops->start_firmware(adapter)) {
                         qlcnic_schedule_work(adapter, qlcnic_attach_work, 0);
                         return;
                 }
@@ -2251,6 +2453,26 @@ qlcnic_dev_request_reset(struct qlcnic_adapter *adapter)
         qlcnic_api_unlock(adapter);
 }
 
+/* Transit to NPAR READY state from NPAR NOT READY state */
+static void
+qlcnic_dev_set_npar_ready(struct qlcnic_adapter *adapter)
+{
+        u32 state;
+
+        if (qlcnic_api_lock(adapter))
+                return;
+
+        state = QLCRD32(adapter, QLCNIC_CRB_DEV_NPAR_STATE);
+
+        if (state != QLCNIC_DEV_NPAR_RDY) {
+                QLCWR32(adapter, QLCNIC_CRB_DEV_NPAR_STATE,
+                        QLCNIC_DEV_NPAR_RDY);
+                QLCDB(adapter, DRV, "NPAR READY state set\n");
+        }
+
+        qlcnic_api_unlock(adapter);
+}
+
 static void
 qlcnic_schedule_work(struct qlcnic_adapter *adapter,
                 work_func_t func, int delay)
@@ -2365,6 +2587,46 @@ reschedule:
         qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY);
 }
 
+static int
+qlcnicvf_start_firmware(struct qlcnic_adapter *adapter)
+{
+        int err;
+
+        err = qlcnic_can_start_firmware(adapter);
+        if (err)
+                return err;
+
+        qlcnic_check_options(adapter);
+
+        adapter->need_fw_reset = 0;
+
+        return err;
+}
+
+static int
+qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
+{
+        return -EOPNOTSUPP;
+}
+
+static int
+qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate)
+{
+        return -EOPNOTSUPP;
+}
+
+static int
+qlcnicvf_set_ilb_mode(struct qlcnic_adapter *adapter)
+{
+        return -EOPNOTSUPP;
+}
+
+static void
+qlcnicvf_clear_ilb_mode(struct qlcnic_adapter *adapter)
+{
+        return;
+}
+
 static ssize_t
 qlcnic_store_bridged_mode(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t len)
@@ -2382,7 +2644,7 @@ qlcnic_store_bridged_mode(struct device *dev,
         if (strict_strtoul(buf, 2, &new))
                 goto err_out;
 
-        if (!qlcnic_config_bridged_mode(adapter, !!new))
+        if (!adapter->nic_ops->config_bridged_mode(adapter, !!new))
                 ret = len;
 
 err_out:
@@ -2464,7 +2726,8 @@ qlcnic_sysfs_validate_crb(struct qlcnic_adapter *adapter,
 }
 
 static ssize_t
-qlcnic_sysfs_read_crb(struct kobject *kobj, struct bin_attribute *attr,
+qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t offset, size_t size)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
@@ -2488,7 +2751,8 @@ qlcnic_sysfs_read_crb(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 static ssize_t
-qlcnic_sysfs_write_crb(struct kobject *kobj, struct bin_attribute *attr,
+qlcnic_sysfs_write_crb(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t offset, size_t size)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
@@ -2525,7 +2789,8 @@ qlcnic_sysfs_validate_mem(struct qlcnic_adapter *adapter,
 }
 
 static ssize_t
-qlcnic_sysfs_read_mem(struct kobject *kobj, struct bin_attribute *attr,
+qlcnic_sysfs_read_mem(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t offset, size_t size)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
@@ -2546,7 +2811,8 @@ qlcnic_sysfs_read_mem(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 static ssize_t
-qlcnic_sysfs_write_mem(struct kobject *kobj, struct bin_attribute *attr,
+qlcnic_sysfs_write_mem(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t offset, size_t size)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index 20624ba44a3..bfb8b327f2f 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -1062,7 +1062,7 @@ struct tx_buf_desc {
 #define TX_DESC_LEN_MASK        0x000fffff
 #define TX_DESC_C       0x40000000
 #define TX_DESC_E       0x80000000
-} __attribute((packed));
+} __packed;
 
 /*
  * IOCB Definitions...
@@ -1095,7 +1095,7 @@ struct ob_mac_iocb_req {
         __le16 vlan_tci;
         __le16 reserved4;
         struct tx_buf_desc tbd[TX_DESC_PER_IOCB];
-} __attribute((packed));
+} __packed;
 
 struct ob_mac_iocb_rsp {
         u8 opcode;              /* */
@@ -1112,7 +1112,7 @@ struct ob_mac_iocb_rsp {
         u32 tid;
         u32 txq_idx;
         __le32 reserved[13];
-} __attribute((packed));
+} __packed;
 
 struct ob_mac_tso_iocb_req {
         u8 opcode;
@@ -1140,7 +1140,7 @@ struct ob_mac_tso_iocb_req {
         __le16 vlan_tci;
         __le16 mss;
         struct tx_buf_desc tbd[TX_DESC_PER_IOCB];
-} __attribute((packed));
+} __packed;
 
 struct ob_mac_tso_iocb_rsp {
         u8 opcode;
@@ -1157,7 +1157,7 @@ struct ob_mac_tso_iocb_rsp {
         u32 tid;
         u32 txq_idx;
         __le32 reserved2[13];
-} __attribute((packed));
+} __packed;
 
 struct ib_mac_iocb_rsp {
         u8 opcode;              /* 0x20 */
@@ -1216,7 +1216,7 @@ struct ib_mac_iocb_rsp {
 #define IB_MAC_IOCB_RSP_HL      0x80
         __le32 hdr_len;         /* */
         __le64 hdr_addr;        /* */
-} __attribute((packed));
+} __packed;
 
 struct ib_ae_iocb_rsp {
         u8 opcode;
@@ -1237,7 +1237,7 @@ struct ib_ae_iocb_rsp {
 #define PCI_ERR_ANON_BUF_RD        0x40
         u8 q_id;
         __le32 reserved[15];
-} __attribute((packed));
+} __packed;
 
 /*
  * These three structures are for generic
@@ -1249,7 +1249,7 @@ struct ql_net_rsp_iocb {
         __le16 length;
         __le32 tid;
         __le32 reserved[14];
-} __attribute((packed));
+} __packed;
 
 struct net_req_iocb {
         u8 opcode;
@@ -1257,7 +1257,7 @@ struct net_req_iocb {
         __le16 flags1;
         __le32 tid;
         __le32 reserved1[30];
-} __attribute((packed));
+} __packed;
 
 /*
  * tx ring initialization control block for chip.
@@ -1283,7 +1283,7 @@ struct wqicb {
         __le16 rid;
         __le64 addr;
         __le64 cnsmr_idx_addr;
-} __attribute((packed));
+} __packed;
 
 /*
  * rx ring initialization control block for chip.
@@ -1317,7 +1317,7 @@ struct cqicb {
         __le64 sbq_addr;
         __le16 sbq_buf_size;
         __le16 sbq_len;         /* entry count */
-} __attribute((packed));
+} __packed;
 
 struct ricb {
         u8 base_cq;
@@ -1335,7 +1335,7 @@ struct ricb {
         u8 hash_cq_id[1024];
         __le32 ipv6_hash_key[10];
         __le32 ipv4_hash_key[4];
-} __attribute((packed));
+} __packed;
 
 /* SOFTWARE/DRIVER DATA STRUCTURES. */
 
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 9a251acf5ab..7d482a2316a 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -44,12 +44,13 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/uaccess.h>
+#include <linux/phy.h>
 
 #include <asm/processor.h>
 
 #define DRV_NAME        "r6040"
-#define DRV_VERSION     "0.25"
-#define DRV_RELDATE     "20Aug2009"
+#define DRV_VERSION     "0.26"
+#define DRV_RELDATE     "30May2010"
 
 /* PHY CHIP Address */
 #define PHY1_ADDR       1       /* For MAC1 */
@@ -179,7 +180,6 @@ struct r6040_descriptor {
 
 struct r6040_private {
         spinlock_t lock;                /* driver lock */
-        struct timer_list timer;
         struct pci_dev *pdev;
         struct r6040_descriptor *rx_insert_ptr;
         struct r6040_descriptor *rx_remove_ptr;
@@ -189,13 +189,15 @@ struct r6040_private {
         struct r6040_descriptor *tx_ring;
         dma_addr_t rx_ring_dma;
         dma_addr_t tx_ring_dma;
-        u16     tx_free_desc, phy_addr, phy_mode;
+        u16     tx_free_desc, phy_addr;
         u16     mcr0, mcr1;
-        u16     switch_sig;
         struct net_device *dev;
-        struct mii_if_info mii_if;
+        struct mii_bus *mii_bus;
         struct napi_struct napi;
         void __iomem *base;
+        struct phy_device *phydev;
+        int old_link;
+        int old_duplex;
 };
 
 static char version[] __devinitdata = KERN_INFO DRV_NAME
@@ -238,20 +240,30 @@ static void r6040_phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val
         }
 }
 
-static int r6040_mdio_read(struct net_device *dev, int mii_id, int reg)
+static int r6040_mdiobus_read(struct mii_bus *bus, int phy_addr, int reg)
 {
+        struct net_device *dev = bus->priv;
         struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
 
-        return (r6040_phy_read(ioaddr, lp->phy_addr, reg));
+        return r6040_phy_read(ioaddr, phy_addr, reg);
 }
 
-static void r6040_mdio_write(struct net_device *dev, int mii_id, int reg, int val)
+static int r6040_mdiobus_write(struct mii_bus *bus, int phy_addr,
+                                                int reg, u16 value)
 {
+        struct net_device *dev = bus->priv;
         struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
 
-        r6040_phy_write(ioaddr, lp->phy_addr, reg, val);
+        r6040_phy_write(ioaddr, phy_addr, reg, value);
+
+        return 0;
+}
+
+static int r6040_mdiobus_reset(struct mii_bus *bus)
+{
+        return 0;
 }
 
 static void r6040_free_txbufs(struct net_device *dev)
@@ -408,10 +420,9 @@ static void r6040_tx_timeout(struct net_device *dev)
         void __iomem *ioaddr = priv->base;
 
         netdev_warn(dev, "transmit timed out, int enable %4.4x "
-                "status %4.4x, PHY status %4.4x\n",
+                "status %4.4x\n",
                 ioread16(ioaddr + MIER),
-                ioread16(ioaddr + MISR),
-                r6040_mdio_read(dev, priv->mii_if.phy_id, MII_BMSR));
+                ioread16(ioaddr + MISR));
 
         dev->stats.tx_errors++;
 
@@ -463,9 +474,6 @@ static int r6040_close(struct net_device *dev)
         struct r6040_private *lp = netdev_priv(dev);
         struct pci_dev *pdev = lp->pdev;
 
-        /* deleted timer */
-        del_timer_sync(&lp->timer);
-
         spin_lock_irq(&lp->lock);
         napi_disable(&lp->napi);
         netif_stop_queue(dev);
@@ -495,64 +503,14 @@ static int r6040_close(struct net_device *dev)
         return 0;
 }
 
-/* Status of PHY CHIP */
-static int r6040_phy_mode_chk(struct net_device *dev)
-{
-        struct r6040_private *lp = netdev_priv(dev);
-        void __iomem *ioaddr = lp->base;
-        int phy_dat;
-
-        /* PHY Link Status Check */
-        phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 1);
-        if (!(phy_dat & 0x4))
-                phy_dat = 0x8000;       /* Link Failed, full duplex */
-
-        /* PHY Chip Auto-Negotiation Status */
-        phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 1);
-        if (phy_dat & 0x0020) {
-                /* Auto Negotiation Mode */
-                phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 5);
-                phy_dat &= r6040_phy_read(ioaddr, lp->phy_addr, 4);
-                if (phy_dat & 0x140)
-                        /* Force full duplex */
-                        phy_dat = 0x8000;
-                else
-                        phy_dat = 0;
-        } else {
-                /* Force Mode */
-                phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 0);
-                if (phy_dat & 0x100)
-                        phy_dat = 0x8000;
-                else
-                        phy_dat = 0x0000;
-        }
-
-        return phy_dat;
-};
-
-static void r6040_set_carrier(struct mii_if_info *mii)
-{
-        if (r6040_phy_mode_chk(mii->dev)) {
-                /* autoneg is off: Link is always assumed to be up */
-                if (!netif_carrier_ok(mii->dev))
-                        netif_carrier_on(mii->dev);
-        } else
-                r6040_phy_mode_chk(mii->dev);
-}
-
 static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         struct r6040_private *lp = netdev_priv(dev);
-        struct mii_ioctl_data *data = if_mii(rq);
-        int rc;
 
-        if (!netif_running(dev))
+        if (!lp->phydev)
                 return -EINVAL;
-        spin_lock_irq(&lp->lock);
-        rc = generic_mii_ioctl(&lp->mii_if, data, cmd, NULL);
-        spin_unlock_irq(&lp->lock);
-        r6040_set_carrier(&lp->mii_if);
-        return rc;
+
+        return phy_mii_ioctl(lp->phydev, if_mii(rq), cmd);
 }
 
 static int r6040_rx(struct net_device *dev, int limit)
@@ -751,26 +709,6 @@ static int r6040_up(struct net_device *dev)
         if (ret)
                 return ret;
 
-        /* Read the PHY ID */
-        lp->switch_sig = r6040_phy_read(ioaddr, 0, 2);
-
-        if (lp->switch_sig  == ICPLUS_PHY_ID) {
-                r6040_phy_write(ioaddr, 29, 31, 0x175C); /* Enable registers */
-                lp->phy_mode = 0x8000;
-        } else {
-                /* PHY Mode Check */
-                r6040_phy_write(ioaddr, lp->phy_addr, 4, PHY_CAP);
-                r6040_phy_write(ioaddr, lp->phy_addr, 0, PHY_MODE);
-
-                if (PHY_MODE == 0x3100)
-                        lp->phy_mode = r6040_phy_mode_chk(dev);
-                else
-                        lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
-        }
-
-        /* Set duplex mode */
-        lp->mcr0 |= lp->phy_mode;
-
         /* improve performance (by RDC guys) */
         r6040_phy_write(ioaddr, 30, 17, (r6040_phy_read(ioaddr, 30, 17) | 0x4000));
         r6040_phy_write(ioaddr, 30, 17, ~((~r6040_phy_read(ioaddr, 30, 17)) | 0x2000));
@@ -783,35 +721,6 @@ static int r6040_up(struct net_device *dev)
         return 0;
 }
 
-/*
-  A periodic timer routine
-        Polling PHY Chip Link Status
-*/
-static void r6040_timer(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct r6040_private *lp = netdev_priv(dev);
-        void __iomem *ioaddr = lp->base;
-        u16 phy_mode;
-
-        /* Polling PHY Chip Status */
-        if (PHY_MODE == 0x3100)
-                phy_mode = r6040_phy_mode_chk(dev);
-        else
-                phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
-
-        if (phy_mode != lp->phy_mode) {
-                lp->phy_mode = phy_mode;
-                lp->mcr0 = (lp->mcr0 & 0x7fff) | phy_mode;
-                iowrite16(lp->mcr0, ioaddr);
-        }
-
-        /* Timer active again */
-        mod_timer(&lp->timer, round_jiffies(jiffies + HZ));
-
-        /* Check media */
-        mii_check_media(&lp->mii_if, 1, 1);
-}
 
 /* Read/set MAC address routines */
 static void r6040_mac_address(struct net_device *dev)
@@ -873,10 +782,6 @@ static int r6040_open(struct net_device *dev)
         napi_enable(&lp->napi);
         netif_start_queue(dev);
 
-        /* set and active a timer process */
-        setup_timer(&lp->timer, r6040_timer, (unsigned long) dev);
-        if (lp->switch_sig != ICPLUS_PHY_ID)
-                mod_timer(&lp->timer, jiffies + HZ);
         return 0;
 }
 
@@ -1015,40 +920,22 @@ static void netdev_get_drvinfo(struct net_device *dev,
 static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct r6040_private *rp = netdev_priv(dev);
-        int rc;
-
-        spin_lock_irq(&rp->lock);
-        rc = mii_ethtool_gset(&rp->mii_if, cmd);
-        spin_unlock_irq(&rp->lock);
 
-        return rc;
+        return  phy_ethtool_gset(rp->phydev, cmd);
 }
 
 static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct r6040_private *rp = netdev_priv(dev);
-        int rc;
-
-        spin_lock_irq(&rp->lock);
-        rc = mii_ethtool_sset(&rp->mii_if, cmd);
-        spin_unlock_irq(&rp->lock);
-        r6040_set_carrier(&rp->mii_if);
-
-        return rc;
-}
-
-static u32 netdev_get_link(struct net_device *dev)
-{
-        struct r6040_private *rp = netdev_priv(dev);
 
-        return mii_link_ok(&rp->mii_if);
+        return phy_ethtool_sset(rp->phydev, cmd);
 }
 
 static const struct ethtool_ops netdev_ethtool_ops = {
         .get_drvinfo            = netdev_get_drvinfo,
         .get_settings           = netdev_get_settings,
         .set_settings           = netdev_set_settings,
-        .get_link               = netdev_get_link,
+        .get_link               = ethtool_op_get_link,
 };
 
 static const struct net_device_ops r6040_netdev_ops = {
@@ -1067,6 +954,79 @@ static const struct net_device_ops r6040_netdev_ops = {
 #endif
 };
 
+static void r6040_adjust_link(struct net_device *dev)
+{
+        struct r6040_private *lp = netdev_priv(dev);
+        struct phy_device *phydev = lp->phydev;
+        int status_changed = 0;
+        void __iomem *ioaddr = lp->base;
+
+        BUG_ON(!phydev);
+
+        if (lp->old_link != phydev->link) {
+                status_changed = 1;
+                lp->old_link = phydev->link;
+        }
+
+        /* reflect duplex change */
+        if (phydev->link && (lp->old_duplex != phydev->duplex)) {
+                lp->mcr0 |= (phydev->duplex == DUPLEX_FULL ? 0x8000 : 0);
+                iowrite16(lp->mcr0, ioaddr);
+
+                status_changed = 1;
+                lp->old_duplex = phydev->duplex;
+        }
+
+        if (status_changed) {
+                pr_info("%s: link %s", dev->name, phydev->link ?
+                        "UP" : "DOWN");
+                if (phydev->link)
+                        pr_cont(" - %d/%s", phydev->speed,
+                        DUPLEX_FULL == phydev->duplex ? "full" : "half");
+                pr_cont("\n");
+        }
+}
+
+static int r6040_mii_probe(struct net_device *dev)
+{
+        struct r6040_private *lp = netdev_priv(dev);
+        struct phy_device *phydev = NULL;
+
+        phydev = phy_find_first(lp->mii_bus);
+        if (!phydev) {
+                dev_err(&lp->pdev->dev, "no PHY found\n");
+                return -ENODEV;
+        }
+
+        phydev = phy_connect(dev, dev_name(&phydev->dev), &r6040_adjust_link,
+                                0, PHY_INTERFACE_MODE_MII);
+
+        if (IS_ERR(phydev)) {
+                dev_err(&lp->pdev->dev, "could not attach to PHY\n");
+                return PTR_ERR(phydev);
+        }
+
+        /* mask with MAC supported features */
+        phydev->supported &= (SUPPORTED_10baseT_Half
+                                | SUPPORTED_10baseT_Full
+                                | SUPPORTED_100baseT_Half
+                                | SUPPORTED_100baseT_Full
+                                | SUPPORTED_Autoneg
+                                | SUPPORTED_MII
+                                | SUPPORTED_TP);
+
+        phydev->advertising = phydev->supported;
+        lp->phydev = phydev;
+        lp->old_link = 0;
+        lp->old_duplex = -1;
+
+        dev_info(&lp->pdev->dev, "attached PHY driver [%s] "
+                "(mii_bus:phy_addr=%s)\n",
+                phydev->drv->name, dev_name(&phydev->dev));
+
+        return 0;
+}
+
 static int __devinit r6040_init_one(struct pci_dev *pdev,
                                          const struct pci_device_id *ent)
 {
@@ -1077,6 +1037,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         static int card_idx = -1;
         int bar = 0;
         u16 *adrp;
+        int i;
 
         printk("%s\n", version);
 
@@ -1163,7 +1124,6 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         /* Init RDC private data */
         lp->mcr0 = 0x1002;
         lp->phy_addr = phy_table[card_idx];
-        lp->switch_sig = 0;
 
         /* The RDC-specific entries in the device structure. */
         dev->netdev_ops = &r6040_netdev_ops;
@@ -1171,28 +1131,54 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         dev->watchdog_timeo = TX_TIMEOUT;
 
         netif_napi_add(dev, &lp->napi, r6040_poll, 64);
-        lp->mii_if.dev = dev;
-        lp->mii_if.mdio_read = r6040_mdio_read;
-        lp->mii_if.mdio_write = r6040_mdio_write;
-        lp->mii_if.phy_id = lp->phy_addr;
-        lp->mii_if.phy_id_mask = 0x1f;
-        lp->mii_if.reg_num_mask = 0x1f;
-
-        /* Check the vendor ID on the PHY, if 0xffff assume none attached */
-        if (r6040_phy_read(ioaddr, lp->phy_addr, 2) == 0xffff) {
-                dev_err(&pdev->dev, "Failed to detect an attached PHY\n");
-                err = -ENODEV;
+
+        lp->mii_bus = mdiobus_alloc();
+        if (!lp->mii_bus) {
+                dev_err(&pdev->dev, "mdiobus_alloc() failed\n");
                 goto err_out_unmap;
         }
 
+        lp->mii_bus->priv = dev;
+        lp->mii_bus->read = r6040_mdiobus_read;
+        lp->mii_bus->write = r6040_mdiobus_write;
+        lp->mii_bus->reset = r6040_mdiobus_reset;
+        lp->mii_bus->name = "r6040_eth_mii";
+        snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%x", card_idx);
+        lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
+        if (!lp->mii_bus->irq) {
+                dev_err(&pdev->dev, "mii_bus irq allocation failed\n");
+                goto err_out_mdio;
+        }
+
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                lp->mii_bus->irq[i] = PHY_POLL;
+
+        err = mdiobus_register(lp->mii_bus);
+        if (err) {
+                dev_err(&pdev->dev, "failed to register MII bus\n");
+                goto err_out_mdio_irq;
+        }
+
+        err = r6040_mii_probe(dev);
+        if (err) {
+                dev_err(&pdev->dev, "failed to probe MII bus\n");
+                goto err_out_mdio_unregister;
+        }
+
         /* Register net device. After this dev->name assign */
         err = register_netdev(dev);
         if (err) {
                 dev_err(&pdev->dev, "Failed to register net device\n");
-                goto err_out_unmap;
+                goto err_out_mdio_unregister;
         }
         return 0;
 
+err_out_mdio_unregister:
+        mdiobus_unregister(lp->mii_bus);
+err_out_mdio_irq:
+        kfree(lp->mii_bus->irq);
+err_out_mdio:
+        mdiobus_free(lp->mii_bus);
 err_out_unmap:
         pci_iounmap(pdev, ioaddr);
 err_out_free_res:
@@ -1206,8 +1192,12 @@ err_out:
 static void __devexit r6040_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct r6040_private *lp = netdev_priv(dev);
 
         unregister_netdev(dev);
+        mdiobus_unregister(lp->mii_bus);
+        kfree(lp->mii_bus->irq);
+        mdiobus_free(lp->mii_bus);
         pci_release_regions(pdev);
         free_netdev(dev);
         pci_disable_device(pdev);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 217e709bda3..239d7efdd45 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -88,7 +88,7 @@ static const int multicast_filter_limit = 32;
 #define RTL_W32(reg, val32)     writel ((val32), ioaddr + (reg))
 #define RTL_R8(reg)             readb (ioaddr + (reg))
 #define RTL_R16(reg)            readw (ioaddr + (reg))
-#define RTL_R32(reg)            ((unsigned long) readl (ioaddr + (reg)))
+#define RTL_R32(reg)            readl (ioaddr + (reg))
 
 enum mac_version {
         RTL_GIGA_MAC_NONE   = 0x00,
@@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
                         break;
                 udelay(25);
         }
+        /*
+         * According to hardware specs a 20us delay is required after write
+         * complete indication, but before sending next command.
+         */
+        udelay(20);
 }
 
 static int mdio_read(void __iomem *ioaddr, int reg_addr)
@@ -578,6 +583,12 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
                 }
                 udelay(25);
         }
+        /*
+         * According to hardware specs a 20us delay is required after read
+         * complete indication, but before sending next command.
+         */
+        udelay(20);
+
         return value;
 }
 
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 15646052723..8ad476a19d9 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -27,6 +27,7 @@
 #include "nic.h"
 
 #include "mcdi.h"
+#include "workarounds.h"
 
 /**************************************************************************
  *
@@ -92,13 +93,6 @@ const char *efx_reset_type_names[] = {
 
 #define EFX_MAX_MTU (9 * 1024)
 
-/* RX slow fill workqueue. If memory allocation fails in the fast path,
- * a work item is pushed onto this work queue to retry the allocation later,
- * to avoid the NIC being starved of RX buffers. Since this is a per cpu
- * workqueue, there is nothing to be gained in making it per NIC
- */
-static struct workqueue_struct *refill_workqueue;
-
 /* Reset workqueue. If any NIC has a hardware failure then a reset will be
  * queued onto this work queue. This is not a per-nic work queue, because
  * efx_reset_work() acquires the rtnl lock, so resets are naturally serialised.
@@ -475,7 +469,8 @@ static void efx_init_channels(struct efx_nic *efx)
         efx->rx_buffer_len = (max(EFX_PAGE_IP_ALIGN, NET_IP_ALIGN) +
                               EFX_MAX_FRAME_LEN(efx->net_dev->mtu) +
                               efx->type->rx_buffer_padding);
-        efx->rx_buffer_order = get_order(efx->rx_buffer_len);
+        efx->rx_buffer_order = get_order(efx->rx_buffer_len +
+                                         sizeof(struct efx_rx_page_state));
 
         /* Initialise the channels */
         efx_for_each_channel(channel, efx) {
@@ -515,11 +510,11 @@ static void efx_start_channel(struct efx_channel *channel)
         channel->enabled = true;
         smp_wmb();
 
-        napi_enable(&channel->napi_str);
-
-        /* Load up RX descriptors */
+        /* Fill the queues before enabling NAPI */
         efx_for_each_channel_rx_queue(rx_queue, channel)
                 efx_fast_push_rx_descriptors(rx_queue);
+
+        napi_enable(&channel->napi_str);
 }
 
 /* This disables event queue processing and packet transmission.
@@ -528,8 +523,6 @@ static void efx_start_channel(struct efx_channel *channel)
  */
 static void efx_stop_channel(struct efx_channel *channel)
 {
-        struct efx_rx_queue *rx_queue;
-
         if (!channel->enabled)
                 return;
 
@@ -537,12 +530,6 @@ static void efx_stop_channel(struct efx_channel *channel)
 
         channel->enabled = false;
         napi_disable(&channel->napi_str);
-
-        /* Ensure that any worker threads have exited or will be no-ops */
-        efx_for_each_channel_rx_queue(rx_queue, channel) {
-                spin_lock_bh(&rx_queue->add_lock);
-                spin_unlock_bh(&rx_queue->add_lock);
-        }
 }
 
 static void efx_fini_channels(struct efx_nic *efx)
@@ -556,10 +543,18 @@ static void efx_fini_channels(struct efx_nic *efx)
         BUG_ON(efx->port_enabled);
 
         rc = efx_nic_flush_queues(efx);
-        if (rc)
+        if (rc && EFX_WORKAROUND_7803(efx)) {
+                /* Schedule a reset to recover from the flush failure. The
+                 * descriptor caches reference memory we're about to free,
+                 * but falcon_reconfigure_mac_wrapper() won't reconnect
+                 * the MACs because of the pending reset. */
+                EFX_ERR(efx, "Resetting to recover from flush failure\n");
+                efx_schedule_reset(efx, RESET_TYPE_ALL);
+        } else if (rc) {
                 EFX_ERR(efx, "failed to flush queues\n");
-        else
+        } else {
                 EFX_LOG(efx, "successfully flushed all queues\n");
+        }
 
         efx_for_each_channel(channel, efx) {
                 EFX_LOG(channel->efx, "shut down chan %d\n", channel->channel);
@@ -586,9 +581,9 @@ static void efx_remove_channel(struct efx_channel *channel)
         efx_remove_eventq(channel);
 }
 
-void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue, int delay)
+void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue)
 {
-        queue_delayed_work(refill_workqueue, &rx_queue->work, delay);
+        mod_timer(&rx_queue->slow_fill, jiffies + msecs_to_jiffies(100));
 }
 
 /**************************************************************************
@@ -1233,15 +1228,8 @@ static void efx_start_all(struct efx_nic *efx)
  * since we're holding the rtnl_lock at this point. */
 static void efx_flush_all(struct efx_nic *efx)
 {
-        struct efx_rx_queue *rx_queue;
-
         /* Make sure the hardware monitor is stopped */
         cancel_delayed_work_sync(&efx->monitor_work);
-
-        /* Ensure that all RX slow refills are complete. */
-        efx_for_each_rx_queue(rx_queue, efx)
-                cancel_delayed_work_sync(&rx_queue->work);
-
         /* Stop scheduled port reconfigurations */
         cancel_work_sync(&efx->mac_work);
 }
@@ -1504,11 +1492,11 @@ static int efx_net_stop(struct net_device *net_dev)
 }
 
 /* Context: process, dev_base_lock or RTNL held, non-blocking. */
-static struct net_device_stats *efx_net_stats(struct net_device *net_dev)
+static struct rtnl_link_stats64 *efx_net_stats(struct net_device *net_dev)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
-        struct net_device_stats *stats = &net_dev->stats;
+        struct rtnl_link_stats64 *stats = &net_dev->stats64;
 
         spin_lock_bh(&efx->stats_lock);
         efx->type->update_stats(efx);
@@ -1530,11 +1518,8 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)
         stats->tx_window_errors = mac_stats->tx_late_collision;
 
         stats->rx_errors = (stats->rx_length_errors +
-                            stats->rx_over_errors +
                             stats->rx_crc_errors +
                             stats->rx_frame_errors +
-                            stats->rx_fifo_errors +
-                            stats->rx_missed_errors +
                             mac_stats->rx_symbol_error);
         stats->tx_errors = (stats->tx_window_errors +
                             mac_stats->tx_bad);
@@ -1645,7 +1630,7 @@ static void efx_set_multicast_list(struct net_device *net_dev)
 static const struct net_device_ops efx_netdev_ops = {
         .ndo_open               = efx_net_open,
         .ndo_stop               = efx_net_stop,
-        .ndo_get_stats          = efx_net_stats,
+        .ndo_get_stats64        = efx_net_stats,
         .ndo_tx_timeout         = efx_watchdog,
         .ndo_start_xmit         = efx_hard_start_xmit,
         .ndo_validate_addr      = eth_validate_addr,
@@ -1886,6 +1871,9 @@ static void efx_reset_work(struct work_struct *data)
 {
         struct efx_nic *efx = container_of(data, struct efx_nic, reset_work);
 
+        if (efx->reset_pending == RESET_TYPE_NONE)
+                return;
+
         /* If we're not RUNNING then don't reset. Leave the reset_pending
          * flag set so that efx_pci_probe_main will be retried */
         if (efx->state != STATE_RUNNING) {
@@ -2052,8 +2040,8 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
                 rx_queue->queue = i;
                 rx_queue->channel = &efx->channel[0]; /* for safety */
                 rx_queue->buffer = NULL;
-                spin_lock_init(&rx_queue->add_lock);
-                INIT_DELAYED_WORK(&rx_queue->work, efx_rx_work);
+                setup_timer(&rx_queue->slow_fill, efx_rx_slow_fill,
+                            (unsigned long)rx_queue);
         }
 
         efx->type = type;
@@ -2332,6 +2320,9 @@ static int efx_pm_thaw(struct device *dev)
 
         efx->type->resume_wol(efx);
 
+        /* Reschedule any quenched resets scheduled during efx_pm_freeze() */
+        queue_work(reset_workqueue, &efx->reset_work);
+
         return 0;
 }
 
@@ -2421,11 +2412,6 @@ static int __init efx_init_module(void)
         if (rc)
                 goto err_notifier;
 
-        refill_workqueue = create_workqueue("sfc_refill");
-        if (!refill_workqueue) {
-                rc = -ENOMEM;
-                goto err_refill;
-        }
         reset_workqueue = create_singlethread_workqueue("sfc_reset");
         if (!reset_workqueue) {
                 rc = -ENOMEM;
@@ -2441,8 +2427,6 @@ static int __init efx_init_module(void)
  err_pci:
         destroy_workqueue(reset_workqueue);
  err_reset:
-        destroy_workqueue(refill_workqueue);
- err_refill:
         unregister_netdevice_notifier(&efx_netdev_notifier);
  err_notifier:
         return rc;
@@ -2454,7 +2438,6 @@ static void __exit efx_exit_module(void)
 
         pci_unregister_driver(&efx_pci_driver);
         destroy_workqueue(reset_workqueue);
-        destroy_workqueue(refill_workqueue);
         unregister_netdevice_notifier(&efx_netdev_notifier);
 
 }
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h
index ffd708c5304..e1e448887df 100644
--- a/drivers/net/sfc/efx.h
+++ b/drivers/net/sfc/efx.h
@@ -47,12 +47,12 @@ extern void efx_init_rx_queue(struct efx_rx_queue *rx_queue);
 extern void efx_fini_rx_queue(struct efx_rx_queue *rx_queue);
 extern void efx_rx_strategy(struct efx_channel *channel);
 extern void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue);
-extern void efx_rx_work(struct work_struct *data);
+extern void efx_rx_slow_fill(unsigned long context);
 extern void __efx_rx_packet(struct efx_channel *channel,
                             struct efx_rx_buffer *rx_buf, bool checksummed);
 extern void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
                           unsigned int len, bool checksummed, bool discard);
-extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue, int delay);
+extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);
 #define EFX_RXQ_SIZE 1024
 #define EFX_RXQ_MASK (EFX_RXQ_SIZE - 1)
 
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 655b697b45b..8558865ff38 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -548,7 +548,9 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
 {
         struct efx_link_state *link_state = &efx->link_state;
         efx_oword_t reg;
-        int link_speed;
+        int link_speed, isolate;
+
+        isolate = (efx->reset_pending != RESET_TYPE_NONE);
 
         switch (link_state->speed) {
         case 10000: link_speed = 3; break;
@@ -570,7 +572,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
          * discarded. */
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
                 EFX_SET_OWORD_FIELD(reg, FRF_BB_TXFIFO_DRAIN_EN,
-                                    !link_state->up);
+                                    !link_state->up || isolate);
         }
 
         efx_writeo(efx, &reg, FR_AB_MAC_CTRL);
@@ -584,7 +586,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
         EFX_SET_OWORD_FIELD(reg, FRF_AZ_RX_XOFF_MAC_EN, 1);
         /* Unisolate the MAC -> RX */
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0)
-                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 1);
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, !isolate);
         efx_writeo(efx, &reg, FR_AZ_RX_CFG);
 }
 
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c
index 6032c0e1f1f..86e43b1f768 100644
--- a/drivers/net/sfc/mcdi_phy.c
+++ b/drivers/net/sfc/mcdi_phy.c
@@ -20,7 +20,7 @@
 #include "nic.h"
 #include "selftest.h"
 
-struct efx_mcdi_phy_cfg {
+struct efx_mcdi_phy_data {
         u32 flags;
         u32 type;
         u32 supported_cap;
@@ -35,7 +35,7 @@ struct efx_mcdi_phy_cfg {
 };
 
 static int
-efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_cfg *cfg)
+efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_data *cfg)
 {
         u8 outbuf[MC_CMD_GET_PHY_CFG_OUT_LEN];
         size_t outlen;
@@ -259,7 +259,7 @@ static u32 ethtool_to_mcdi_cap(u32 cap)
 
 static u32 efx_get_mcdi_phy_flags(struct efx_nic *efx)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         enum efx_phy_mode mode, supported;
         u32 flags;
 
@@ -307,7 +307,7 @@ static u32 mcdi_to_ethtool_media(u32 media)
 
 static int efx_mcdi_phy_probe(struct efx_nic *efx)
 {
-        struct efx_mcdi_phy_cfg *phy_data;
+        struct efx_mcdi_phy_data *phy_data;
         u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];
         u32 caps;
         int rc;
@@ -395,6 +395,7 @@ static int efx_mcdi_phy_probe(struct efx_nic *efx)
         efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
         if (phy_data->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))
                 efx->wanted_fc |= EFX_FC_AUTO;
+        efx_link_set_wanted_fc(efx, efx->wanted_fc);
 
         return 0;
 
@@ -405,7 +406,7 @@ fail:
 
 int efx_mcdi_phy_reconfigure(struct efx_nic *efx)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 caps = (efx->link_advertising ?
                     ethtool_to_mcdi_cap(efx->link_advertising) :
                     phy_cfg->forced_cap);
@@ -446,7 +447,7 @@ void efx_mcdi_phy_decode_link(struct efx_nic *efx,
  */
 void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 rmtadv;
 
         /* The link partner capabilities are only relevent if the
@@ -505,7 +506,7 @@ static void efx_mcdi_phy_remove(struct efx_nic *efx)
 
 static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];
         int rc;
 
@@ -535,7 +536,7 @@ static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *e
 
 static int efx_mcdi_phy_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 caps;
         int rc;
 
@@ -674,7 +675,7 @@ out:
 static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results,
                                   unsigned flags)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
         u32 mode;
         int rc;
 
@@ -712,7 +713,7 @@ static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results,
 
 const char *efx_mcdi_phy_test_name(struct efx_nic *efx, unsigned int index)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data;
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
 
         if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_BIST_LBN)) {
                 if (index == 0)
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 2e6fd89f2a7..ba636e086fc 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -18,6 +18,7 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
+#include <linux/timer.h>
 #include <linux/mdio.h>
 #include <linux/list.h>
 #include <linux/pci.h>
@@ -221,7 +222,6 @@ struct efx_tx_queue {
  *      If both this and skb are %NULL, the buffer slot is currently free.
  * @data: Pointer to ethernet header
  * @len: Buffer length, in bytes.
- * @unmap_addr: DMA address to unmap
  */
 struct efx_rx_buffer {
         dma_addr_t dma_addr;
@@ -229,7 +229,24 @@ struct efx_rx_buffer {
         struct page *page;
         char *data;
         unsigned int len;
-        dma_addr_t unmap_addr;
+};
+
+/**
+ * struct efx_rx_page_state - Page-based rx buffer state
+ *
+ * Inserted at the start of every page allocated for receive buffers.
+ * Used to facilitate sharing dma mappings between recycled rx buffers
+ * and those passed up to the kernel.
+ *
+ * @refcnt: Number of struct efx_rx_buffer's referencing this page.
+ *      When refcnt falls to zero, the page is unmapped for dma
+ * @dma_addr: The dma address of this page.
+ */
+struct efx_rx_page_state {
+        unsigned refcnt;
+        dma_addr_t dma_addr;
+
+        unsigned int __pad[0] ____cacheline_aligned;
 };
 
 /**
@@ -242,10 +259,6 @@ struct efx_rx_buffer {
  * @added_count: Number of buffers added to the receive queue.
  * @notified_count: Number of buffers given to NIC (<= @added_count).
  * @removed_count: Number of buffers removed from the receive queue.
- * @add_lock: Receive queue descriptor add spin lock.
- *      This lock must be held in order to add buffers to the RX
- *      descriptor ring (rxd and buffer) and to update added_count (but
- *      not removed_count).
  * @max_fill: RX descriptor maximum fill level (<= ring size)
  * @fast_fill_trigger: RX descriptor fill level that will trigger a fast fill
  *      (<= @max_fill)
@@ -259,12 +272,7 @@ struct efx_rx_buffer {
  *      overflow was observed.  It should never be set.
  * @alloc_page_count: RX allocation strategy counter.
  * @alloc_skb_count: RX allocation strategy counter.
- * @work: Descriptor push work thread
- * @buf_page: Page for next RX buffer.
- *      We can use a single page for multiple RX buffers. This tracks
- *      the remaining space in the allocation.
- * @buf_dma_addr: Page's DMA address.
- * @buf_data: Page's host address.
+ * @slow_fill: Timer used to defer efx_nic_generate_fill_event().
  * @flushed: Use when handling queue flushing
  */
 struct efx_rx_queue {
@@ -277,7 +285,6 @@ struct efx_rx_queue {
         int added_count;
         int notified_count;
         int removed_count;
-        spinlock_t add_lock;
         unsigned int max_fill;
         unsigned int fast_fill_trigger;
         unsigned int fast_fill_limit;
@@ -285,12 +292,9 @@ struct efx_rx_queue {
         unsigned int min_overfill;
         unsigned int alloc_page_count;
         unsigned int alloc_skb_count;
-        struct delayed_work work;
+        struct timer_list slow_fill;
         unsigned int slow_fill_count;
 
-        struct page *buf_page;
-        dma_addr_t buf_dma_addr;
-        char *buf_data;
         enum efx_flush_state flushed;
 };
 
@@ -336,7 +340,7 @@ enum efx_rx_alloc_method {
  * @eventq: Event queue buffer
  * @eventq_read_ptr: Event queue read pointer
  * @last_eventq_read_ptr: Last event queue read pointer value.
- * @eventq_magic: Event queue magic value for driver-generated test events
+ * @magic_count: Event queue test event count
  * @irq_count: Number of IRQs since last adaptive moderation decision
  * @irq_mod_score: IRQ moderation score
  * @rx_alloc_level: Watermark based heuristic counter for pushing descriptors
@@ -367,7 +371,7 @@ struct efx_channel {
         struct efx_special_buffer eventq;
         unsigned int eventq_read_ptr;
         unsigned int last_eventq_read_ptr;
-        unsigned int eventq_magic;
+        unsigned int magic_count;
 
         unsigned int irq_count;
         unsigned int irq_mod_score;
@@ -645,6 +649,7 @@ union efx_multicast_hash {
  * struct efx_nic - an Efx NIC
  * @name: Device name (net device name or bus id before net device registered)
  * @pci_dev: The PCI device
+ * @port_num: Index of this host port within the controller
  * @type: Controller type attributes
  * @legacy_irq: IRQ number
  * @workqueue: Workqueue for port reconfigures and the HW monitor.
@@ -728,6 +733,7 @@ union efx_multicast_hash {
 struct efx_nic {
         char name[IFNAMSIZ];
         struct pci_dev *pci_dev;
+        unsigned port_num;
         const struct efx_nic_type *type;
         int legacy_irq;
         struct workqueue_struct *workqueue;
@@ -830,7 +836,7 @@ static inline const char *efx_dev_name(struct efx_nic *efx)
 
 static inline unsigned int efx_port_num(struct efx_nic *efx)
 {
-        return PCI_FUNC(efx->pci_dev->devfn);
+        return efx->net_dev->dev_id;
 }
 
 /**
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index 5d3aaec5855..0ee6fd367e6 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -79,6 +79,14 @@ MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");
 /* Depth of RX flush request fifo */
 #define EFX_RX_FLUSH_COUNT 4
 
+/* Generated event code for efx_generate_test_event() */
+#define EFX_CHANNEL_MAGIC_TEST(_channel)        \
+        (0x00010100 + (_channel)->channel)
+
+/* Generated event code for efx_generate_fill_event() */
+#define EFX_CHANNEL_MAGIC_FILL(_channel)        \
+        (0x00010200 + (_channel)->channel)
+
 /**************************************************************************
  *
  * Solarstorm hardware access
@@ -850,6 +858,26 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
                       checksummed, discard);
 }
 
+static void
+efx_handle_generated_event(struct efx_channel *channel, efx_qword_t *event)
+{
+        struct efx_nic *efx = channel->efx;
+        unsigned code;
+
+        code = EFX_QWORD_FIELD(*event, FSF_AZ_DRV_GEN_EV_MAGIC);
+        if (code == EFX_CHANNEL_MAGIC_TEST(channel))
+                ++channel->magic_count;
+        else if (code == EFX_CHANNEL_MAGIC_FILL(channel))
+                /* The queue must be empty, so we won't receive any rx
+                 * events, so efx_process_channel() won't refill the
+                 * queue. Refill it here */
+                efx_fast_push_rx_descriptors(&efx->rx_queue[channel->channel]);
+        else
+                EFX_LOG(efx, "channel %d received generated "
+                        "event "EFX_QWORD_FMT"\n", channel->channel,
+                        EFX_QWORD_VAL(*event));
+}
+
 /* Global events are basically PHY events */
 static void
 efx_handle_global_event(struct efx_channel *channel, efx_qword_t *event)
@@ -993,11 +1021,7 @@ int efx_nic_process_eventq(struct efx_channel *channel, int budget)
                         }
                         break;
                 case FSE_AZ_EV_CODE_DRV_GEN_EV:
-                        channel->eventq_magic = EFX_QWORD_FIELD(
-                                event, FSF_AZ_DRV_GEN_EV_MAGIC);
-                        EFX_LOG(channel->efx, "channel %d received generated "
-                                "event "EFX_QWORD_FMT"\n", channel->channel,
-                                EFX_QWORD_VAL(event));
+                        efx_handle_generated_event(channel, &event);
                         break;
                 case FSE_AZ_EV_CODE_GLOBAL_EV:
                         efx_handle_global_event(channel, &event);
@@ -1088,12 +1112,20 @@ void efx_nic_remove_eventq(struct efx_channel *channel)
 }
 
 
-/* Generates a test event on the event queue.  A subsequent call to
- * process_eventq() should pick up the event and place the value of
- * "magic" into channel->eventq_magic;
- */
-void efx_nic_generate_test_event(struct efx_channel *channel, unsigned int magic)
+void efx_nic_generate_test_event(struct efx_channel *channel)
 {
+        unsigned int magic = EFX_CHANNEL_MAGIC_TEST(channel);
+        efx_qword_t test_event;
+
+        EFX_POPULATE_QWORD_2(test_event, FSF_AZ_EV_CODE,
+                             FSE_AZ_EV_CODE_DRV_GEN_EV,
+                             FSF_AZ_DRV_GEN_EV_MAGIC, magic);
+        efx_generate_event(channel, &test_event);
+}
+
+void efx_nic_generate_fill_event(struct efx_channel *channel)
+{
+        unsigned int magic = EFX_CHANNEL_MAGIC_FILL(channel);
         efx_qword_t test_event;
 
         EFX_POPULATE_QWORD_2(test_event, FSF_AZ_EV_CODE,
@@ -1219,9 +1251,6 @@ int efx_nic_flush_queues(struct efx_nic *efx)
                 rx_queue->flushed = FLUSH_DONE;
         }
 
-        if (EFX_WORKAROUND_7803(efx))
-                return 0;
-
         return -ETIMEDOUT;
 }
 
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h
index bbc2c0c2f84..95770e15115 100644
--- a/drivers/net/sfc/nic.h
+++ b/drivers/net/sfc/nic.h
@@ -190,8 +190,8 @@ extern int efx_nic_rx_xoff_thresh, efx_nic_rx_xon_thresh;
 /* Interrupts and test events */
 extern int efx_nic_init_interrupt(struct efx_nic *efx);
 extern void efx_nic_enable_interrupts(struct efx_nic *efx);
-extern void efx_nic_generate_test_event(struct efx_channel *channel,
-                                        unsigned int magic);
+extern void efx_nic_generate_test_event(struct efx_channel *channel);
+extern void efx_nic_generate_fill_event(struct efx_channel *channel);
 extern void efx_nic_generate_interrupt(struct efx_nic *efx);
 extern void efx_nic_disable_interrupts(struct efx_nic *efx);
 extern void efx_nic_fini_interrupt(struct efx_nic *efx);
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index e308818b9f5..9fb698e3519 100644
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -25,6 +25,9 @@
 /* Number of RX descriptors pushed at once. */
 #define EFX_RX_BATCH  8
 
+/* Maximum size of a buffer sharing a page */
+#define EFX_RX_HALF_PAGE ((PAGE_SIZE >> 1) - sizeof(struct efx_rx_page_state))
+
 /* Size of buffer allocated for skb header area. */
 #define EFX_SKB_HEADERS  64u
 
@@ -98,155 +101,138 @@ static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
         return PAGE_SIZE << efx->rx_buffer_order;
 }
 
-
 /**
- * efx_init_rx_buffer_skb - create new RX buffer using skb-based allocation
+ * efx_init_rx_buffers_skb - create EFX_RX_BATCH skb-based RX buffers
  *
  * @rx_queue:           Efx RX queue
- * @rx_buf:             RX buffer structure to populate
  *
- * This allocates memory for a new receive buffer, maps it for DMA,
- * and populates a struct efx_rx_buffer with the relevant
- * information.  Return a negative error code or 0 on success.
+ * This allocates EFX_RX_BATCH skbs, maps them for DMA, and populates a
+ * struct efx_rx_buffer for each one. Return a negative error code or 0
+ * on success. May fail having only inserted fewer than EFX_RX_BATCH
+ * buffers.
  */
-static int efx_init_rx_buffer_skb(struct efx_rx_queue *rx_queue,
-                                  struct efx_rx_buffer *rx_buf)
+static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
         struct net_device *net_dev = efx->net_dev;
+        struct efx_rx_buffer *rx_buf;
         int skb_len = efx->rx_buffer_len;
+        unsigned index, count;
 
-        rx_buf->skb = netdev_alloc_skb(net_dev, skb_len);
-        if (unlikely(!rx_buf->skb))
-                return -ENOMEM;
+        for (count = 0; count < EFX_RX_BATCH; ++count) {
+                index = rx_queue->added_count & EFX_RXQ_MASK;
+                rx_buf = efx_rx_buffer(rx_queue, index);
 
-        /* Adjust the SKB for padding and checksum */
-        skb_reserve(rx_buf->skb, NET_IP_ALIGN);
-        rx_buf->len = skb_len - NET_IP_ALIGN;
-        rx_buf->data = (char *)rx_buf->skb->data;
-        rx_buf->skb->ip_summed = CHECKSUM_UNNECESSARY;
+                rx_buf->skb = netdev_alloc_skb(net_dev, skb_len);
+                if (unlikely(!rx_buf->skb))
+                        return -ENOMEM;
+                rx_buf->page = NULL;
 
-        rx_buf->dma_addr = pci_map_single(efx->pci_dev,
-                                          rx_buf->data, rx_buf->len,
-                                          PCI_DMA_FROMDEVICE);
+                /* Adjust the SKB for padding and checksum */
+                skb_reserve(rx_buf->skb, NET_IP_ALIGN);
+                rx_buf->len = skb_len - NET_IP_ALIGN;
+                rx_buf->data = (char *)rx_buf->skb->data;
+                rx_buf->skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+                rx_buf->dma_addr = pci_map_single(efx->pci_dev,
+                                                  rx_buf->data, rx_buf->len,
+                                                  PCI_DMA_FROMDEVICE);
+                if (unlikely(pci_dma_mapping_error(efx->pci_dev,
+                                                   rx_buf->dma_addr))) {
+                        dev_kfree_skb_any(rx_buf->skb);
+                        rx_buf->skb = NULL;
+                        return -EIO;
+                }
 
-        if (unlikely(pci_dma_mapping_error(efx->pci_dev, rx_buf->dma_addr))) {
-                dev_kfree_skb_any(rx_buf->skb);
-                rx_buf->skb = NULL;
-                return -EIO;
+                ++rx_queue->added_count;
+                ++rx_queue->alloc_skb_count;
         }
 
         return 0;
 }
 
 /**
- * efx_init_rx_buffer_page - create new RX buffer using page-based allocation
+ * efx_init_rx_buffers_page - create EFX_RX_BATCH page-based RX buffers
  *
  * @rx_queue:           Efx RX queue
- * @rx_buf:             RX buffer structure to populate
  *
- * This allocates memory for a new receive buffer, maps it for DMA,
- * and populates a struct efx_rx_buffer with the relevant
- * information.  Return a negative error code or 0 on success.
+ * This allocates memory for EFX_RX_BATCH receive buffers, maps them for DMA,
+ * and populates struct efx_rx_buffers for each one. Return a negative error
+ * code or 0 on success. If a single page can be split between two buffers,
+ * then the page will either be inserted fully, or not at at all.
  */
-static int efx_init_rx_buffer_page(struct efx_rx_queue *rx_queue,
-                                   struct efx_rx_buffer *rx_buf)
+static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
-        int bytes, space, offset;
-
-        bytes = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
-
-        /* If there is space left in the previously allocated page,
-         * then use it. Otherwise allocate a new one */
-        rx_buf->page = rx_queue->buf_page;
-        if (rx_buf->page == NULL) {
-                dma_addr_t dma_addr;
-
-                rx_buf->page = alloc_pages(__GFP_COLD | __GFP_COMP | GFP_ATOMIC,
-                                           efx->rx_buffer_order);
-                if (unlikely(rx_buf->page == NULL))
+        struct efx_rx_buffer *rx_buf;
+        struct page *page;
+        void *page_addr;
+        struct efx_rx_page_state *state;
+        dma_addr_t dma_addr;
+        unsigned index, count;
+
+        /* We can split a page between two buffers */
+        BUILD_BUG_ON(EFX_RX_BATCH & 1);
+
+        for (count = 0; count < EFX_RX_BATCH; ++count) {
+                page = alloc_pages(__GFP_COLD | __GFP_COMP | GFP_ATOMIC,
+                                   efx->rx_buffer_order);
+                if (unlikely(page == NULL))
                         return -ENOMEM;
-
-                dma_addr = pci_map_page(efx->pci_dev, rx_buf->page,
-                                        0, efx_rx_buf_size(efx),
+                dma_addr = pci_map_page(efx->pci_dev, page, 0,
+                                        efx_rx_buf_size(efx),
                                         PCI_DMA_FROMDEVICE);
-
                 if (unlikely(pci_dma_mapping_error(efx->pci_dev, dma_addr))) {
-                        __free_pages(rx_buf->page, efx->rx_buffer_order);
-                        rx_buf->page = NULL;
+                        __free_pages(page, efx->rx_buffer_order);
                         return -EIO;
                 }
-
-                rx_queue->buf_page = rx_buf->page;
-                rx_queue->buf_dma_addr = dma_addr;
-                rx_queue->buf_data = (page_address(rx_buf->page) +
-                                      EFX_PAGE_IP_ALIGN);
-        }
-
-        rx_buf->len = bytes;
-        rx_buf->data = rx_queue->buf_data;
-        offset = efx_rx_buf_offset(rx_buf);
-        rx_buf->dma_addr = rx_queue->buf_dma_addr + offset;
-
-        /* Try to pack multiple buffers per page */
-        if (efx->rx_buffer_order == 0) {
-                /* The next buffer starts on the next 512 byte boundary */
-                rx_queue->buf_data += ((bytes + 0x1ff) & ~0x1ff);
-                offset += ((bytes + 0x1ff) & ~0x1ff);
-
-                space = efx_rx_buf_size(efx) - offset;
-                if (space >= bytes) {
-                        /* Refs dropped on kernel releasing each skb */
-                        get_page(rx_queue->buf_page);
-                        goto out;
+                page_addr = page_address(page);
+                state = page_addr;
+                state->refcnt = 0;
+                state->dma_addr = dma_addr;
+
+                page_addr += sizeof(struct efx_rx_page_state);
+                dma_addr += sizeof(struct efx_rx_page_state);
+
+        split:
+                index = rx_queue->added_count & EFX_RXQ_MASK;
+                rx_buf = efx_rx_buffer(rx_queue, index);
+                rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
+                rx_buf->skb = NULL;
+                rx_buf->page = page;
+                rx_buf->data = page_addr + EFX_PAGE_IP_ALIGN;
+                rx_buf->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
+                ++rx_queue->added_count;
+                ++rx_queue->alloc_page_count;
+                ++state->refcnt;
+
+                if ((~count & 1) && (efx->rx_buffer_len <= EFX_RX_HALF_PAGE)) {
+                        /* Use the second half of the page */
+                        get_page(page);
+                        dma_addr += (PAGE_SIZE >> 1);
+                        page_addr += (PAGE_SIZE >> 1);
+                        ++count;
+                        goto split;
                 }
         }
 
-        /* This is the final RX buffer for this page, so mark it for
-         * unmapping */
-        rx_queue->buf_page = NULL;
-        rx_buf->unmap_addr = rx_queue->buf_dma_addr;
-
- out:
         return 0;
 }
 
-/* This allocates memory for a new receive buffer, maps it for DMA,
- * and populates a struct efx_rx_buffer with the relevant
- * information.
- */
-static int efx_init_rx_buffer(struct efx_rx_queue *rx_queue,
-                              struct efx_rx_buffer *new_rx_buf)
-{
-        int rc = 0;
-
-        if (rx_queue->channel->rx_alloc_push_pages) {
-                new_rx_buf->skb = NULL;
-                rc = efx_init_rx_buffer_page(rx_queue, new_rx_buf);
-                rx_queue->alloc_page_count++;
-        } else {
-                new_rx_buf->page = NULL;
-                rc = efx_init_rx_buffer_skb(rx_queue, new_rx_buf);
-                rx_queue->alloc_skb_count++;
-        }
-
-        if (unlikely(rc < 0))
-                EFX_LOG_RL(rx_queue->efx, "%s RXQ[%d] =%d\n", __func__,
-                           rx_queue->queue, rc);
-        return rc;
-}
-
 static void efx_unmap_rx_buffer(struct efx_nic *efx,
                                 struct efx_rx_buffer *rx_buf)
 {
         if (rx_buf->page) {
+                struct efx_rx_page_state *state;
+
                 EFX_BUG_ON_PARANOID(rx_buf->skb);
-                if (rx_buf->unmap_addr) {
-                        pci_unmap_page(efx->pci_dev, rx_buf->unmap_addr,
+
+                state = page_address(rx_buf->page);
+                if (--state->refcnt == 0) {
+                        pci_unmap_page(efx->pci_dev,
+                                       state->dma_addr,
                                        efx_rx_buf_size(efx),
                                        PCI_DMA_FROMDEVICE);
-                        rx_buf->unmap_addr = 0;
                 }
         } else if (likely(rx_buf->skb)) {
                 pci_unmap_single(efx->pci_dev, rx_buf->dma_addr,
@@ -273,31 +259,84 @@ static void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,
         efx_free_rx_buffer(rx_queue->efx, rx_buf);
 }
 
+/* Attempt to resurrect the other receive buffer that used to share this page,
+ * which had previously been passed up to the kernel and freed. */
+static void efx_resurrect_rx_buffer(struct efx_rx_queue *rx_queue,
+                                    struct efx_rx_buffer *rx_buf)
+{
+        struct efx_rx_page_state *state = page_address(rx_buf->page);
+        struct efx_rx_buffer *new_buf;
+        unsigned fill_level, index;
+
+        /* +1 because efx_rx_packet() incremented removed_count. +1 because
+         * we'd like to insert an additional descriptor whilst leaving
+         * EFX_RXD_HEAD_ROOM for the non-recycle path */
+        fill_level = (rx_queue->added_count - rx_queue->removed_count + 2);
+        if (unlikely(fill_level >= EFX_RXQ_SIZE - EFX_RXD_HEAD_ROOM)) {
+                /* We could place "state" on a list, and drain the list in
+                 * efx_fast_push_rx_descriptors(). For now, this will do. */
+                return;
+        }
+
+        ++state->refcnt;
+        get_page(rx_buf->page);
+
+        index = rx_queue->added_count & EFX_RXQ_MASK;
+        new_buf = efx_rx_buffer(rx_queue, index);
+        new_buf->dma_addr = rx_buf->dma_addr ^ (PAGE_SIZE >> 1);
+        new_buf->skb = NULL;
+        new_buf->page = rx_buf->page;
+        new_buf->data = (void *)
+                ((__force unsigned long)rx_buf->data ^ (PAGE_SIZE >> 1));
+        new_buf->len = rx_buf->len;
+        ++rx_queue->added_count;
+}
+
+/* Recycle the given rx buffer directly back into the rx_queue. There is
+ * always room to add this buffer, because we've just popped a buffer. */
+static void efx_recycle_rx_buffer(struct efx_channel *channel,
+                                  struct efx_rx_buffer *rx_buf)
+{
+        struct efx_nic *efx = channel->efx;
+        struct efx_rx_queue *rx_queue = &efx->rx_queue[channel->channel];
+        struct efx_rx_buffer *new_buf;
+        unsigned index;
+
+        if (rx_buf->page != NULL && efx->rx_buffer_len <= EFX_RX_HALF_PAGE &&
+            page_count(rx_buf->page) == 1)
+                efx_resurrect_rx_buffer(rx_queue, rx_buf);
+
+        index = rx_queue->added_count & EFX_RXQ_MASK;
+        new_buf = efx_rx_buffer(rx_queue, index);
+
+        memcpy(new_buf, rx_buf, sizeof(*new_buf));
+        rx_buf->page = NULL;
+        rx_buf->skb = NULL;
+        ++rx_queue->added_count;
+}
+
 /**
  * efx_fast_push_rx_descriptors - push new RX descriptors quickly
  * @rx_queue:           RX descriptor queue
- * @retry:              Recheck the fill level
  * This will aim to fill the RX descriptor queue up to
  * @rx_queue->@fast_fill_limit. If there is insufficient atomic
- * memory to do so, the caller should retry.
+ * memory to do so, a slow fill will be scheduled.
+ *
+ * The caller must provide serialisation (none is used here). In practise,
+ * this means this function must run from the NAPI handler, or be called
+ * when NAPI is disabled.
  */
-static int __efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue,
-                                          int retry)
+void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue)
 {
-        struct efx_rx_buffer *rx_buf;
-        unsigned fill_level, index;
-        int i, space, rc = 0;
+        struct efx_channel *channel = rx_queue->channel;
+        unsigned fill_level;
+        int space, rc = 0;
 
-        /* Calculate current fill level.  Do this outside the lock,
-         * because most of the time we'll end up not wanting to do the
-         * fill anyway.
-         */
+        /* Calculate current fill level, and exit if we don't need to fill */
         fill_level = (rx_queue->added_count - rx_queue->removed_count);
         EFX_BUG_ON_PARANOID(fill_level > EFX_RXQ_SIZE);
-
-        /* Don't fill if we don't need to */
         if (fill_level >= rx_queue->fast_fill_trigger)
-                return 0;
+                goto out;
 
         /* Record minimum fill level */
         if (unlikely(fill_level < rx_queue->min_fill)) {
@@ -305,34 +344,25 @@ static int __efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue,
                         rx_queue->min_fill = fill_level;
         }
 
-        /* Acquire RX add lock.  If this lock is contended, then a fast
-         * fill must already be in progress (e.g. in the refill
-         * tasklet), so we don't need to do anything
-         */
-        if (!spin_trylock_bh(&rx_queue->add_lock))
-                return -1;
-
- retry:
-        /* Recalculate current fill level now that we have the lock */
-        fill_level = (rx_queue->added_count - rx_queue->removed_count);
-        EFX_BUG_ON_PARANOID(fill_level > EFX_RXQ_SIZE);
         space = rx_queue->fast_fill_limit - fill_level;
         if (space < EFX_RX_BATCH)
-                goto out_unlock;
+                goto out;
 
         EFX_TRACE(rx_queue->efx, "RX queue %d fast-filling descriptor ring from"
                   " level %d to level %d using %s allocation\n",
                   rx_queue->queue, fill_level, rx_queue->fast_fill_limit,
-                  rx_queue->channel->rx_alloc_push_pages ? "page" : "skb");
+                  channel->rx_alloc_push_pages ? "page" : "skb");
 
         do {
-                for (i = 0; i < EFX_RX_BATCH; ++i) {
-                        index = rx_queue->added_count & EFX_RXQ_MASK;
-                        rx_buf = efx_rx_buffer(rx_queue, index);
-                        rc = efx_init_rx_buffer(rx_queue, rx_buf);
-                        if (unlikely(rc))
-                                goto out;
-                        ++rx_queue->added_count;
+                if (channel->rx_alloc_push_pages)
+                        rc = efx_init_rx_buffers_page(rx_queue);
+                else
+                        rc = efx_init_rx_buffers_skb(rx_queue);
+                if (unlikely(rc)) {
+                        /* Ensure that we don't leave the rx queue empty */
+                        if (rx_queue->added_count == rx_queue->removed_count)
+                                efx_schedule_slow_fill(rx_queue);
+                        goto out;
                 }
         } while ((space -= EFX_RX_BATCH) >= EFX_RX_BATCH);
 
@@ -341,63 +371,18 @@ static int __efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue,
                   rx_queue->added_count - rx_queue->removed_count);
 
  out:
-        /* Send write pointer to card. */
-        efx_nic_notify_rx_desc(rx_queue);
-
-        /* If the fast fill is running inside from the refill tasklet, then
-         * for SMP systems it may be running on a different CPU to
-         * RX event processing, which means that the fill level may now be
-         * out of date. */
-        if (unlikely(retry && (rc == 0)))
-                goto retry;
-
- out_unlock:
-        spin_unlock_bh(&rx_queue->add_lock);
-
-        return rc;
-}
-
-/**
- * efx_fast_push_rx_descriptors - push new RX descriptors quickly
- * @rx_queue:           RX descriptor queue
- *
- * This will aim to fill the RX descriptor queue up to
- * @rx_queue->@fast_fill_limit.  If there is insufficient memory to do so,
- * it will schedule a work item to immediately continue the fast fill
- */
-void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue)
-{
-        int rc;
-
-        rc = __efx_fast_push_rx_descriptors(rx_queue, 0);
-        if (unlikely(rc)) {
-                /* Schedule the work item to run immediately. The hope is
-                 * that work is immediately pending to free some memory
-                 * (e.g. an RX event or TX completion)
-                 */
-                efx_schedule_slow_fill(rx_queue, 0);
-        }
+        if (rx_queue->notified_count != rx_queue->added_count)
+                efx_nic_notify_rx_desc(rx_queue);
 }
 
-void efx_rx_work(struct work_struct *data)
+void efx_rx_slow_fill(unsigned long context)
 {
-        struct efx_rx_queue *rx_queue;
-        int rc;
-
-        rx_queue = container_of(data, struct efx_rx_queue, work.work);
-
-        if (unlikely(!rx_queue->channel->enabled))
-                return;
-
-        EFX_TRACE(rx_queue->efx, "RX queue %d worker thread executing on CPU "
-                  "%d\n", rx_queue->queue, raw_smp_processor_id());
+        struct efx_rx_queue *rx_queue = (struct efx_rx_queue *)context;
+        struct efx_channel *channel = rx_queue->channel;
 
+        /* Post an event to cause NAPI to run and refill the queue */
+        efx_nic_generate_fill_event(channel);
         ++rx_queue->slow_fill_count;
-        /* Push new RX descriptors, allowing at least 1 jiffy for
-         * the kernel to free some more memory. */
-        rc = __efx_fast_push_rx_descriptors(rx_queue, 1);
-        if (rc)
-                efx_schedule_slow_fill(rx_queue, 1);
 }
 
 static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
@@ -498,6 +483,7 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
                    unsigned int len, bool checksummed, bool discard)
 {
         struct efx_nic *efx = rx_queue->efx;
+        struct efx_channel *channel = rx_queue->channel;
         struct efx_rx_buffer *rx_buf;
         bool leak_packet = false;
 
@@ -525,12 +511,13 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
         /* Discard packet, if instructed to do so */
         if (unlikely(discard)) {
                 if (unlikely(leak_packet))
-                        rx_queue->channel->n_skbuff_leaks++;
+                        channel->n_skbuff_leaks++;
                 else
-                        /* We haven't called efx_unmap_rx_buffer yet,
-                         * so fini the entire rx_buffer here */
-                        efx_fini_rx_buffer(rx_queue, rx_buf);
-                return;
+                        efx_recycle_rx_buffer(channel, rx_buf);
+
+                /* Don't hold off the previous receive */
+                rx_buf = NULL;
+                goto out;
         }
 
         /* Release card resources - assumes all RX buffers consumed in-order
@@ -547,6 +534,7 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
          * prefetched into cache.
          */
         rx_buf->len = len;
+out:
         if (rx_queue->channel->rx_pkt)
                 __efx_rx_packet(rx_queue->channel,
                                 rx_queue->channel->rx_pkt,
@@ -682,6 +670,7 @@ void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)
 
         EFX_LOG(rx_queue->efx, "shutting down RX queue %d\n", rx_queue->queue);
 
+        del_timer_sync(&rx_queue->slow_fill);
         efx_nic_fini_rx(rx_queue);
 
         /* Release RX buffers NB start at index 0 not current HW ptr */
@@ -691,16 +680,6 @@ void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)
                         efx_fini_rx_buffer(rx_queue, rx_buf);
                 }
         }
-
-        /* For a page that is part-way through splitting into RX buffers */
-        if (rx_queue->buf_page != NULL) {
-                pci_unmap_page(rx_queue->efx->pci_dev, rx_queue->buf_dma_addr,
-                               efx_rx_buf_size(rx_queue->efx),
-                               PCI_DMA_FROMDEVICE);
-                __free_pages(rx_queue->buf_page,
-                             rx_queue->efx->rx_buffer_order);
-                rx_queue->buf_page = NULL;
-        }
 }
 
 void efx_remove_rx_queue(struct efx_rx_queue *rx_queue)
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 371e86cc090..1f83404af63 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -38,7 +38,7 @@ struct efx_loopback_payload {
         struct udphdr udp;
         __be16 iteration;
         const char msg[64];
-} __attribute__ ((packed));
+} __packed;
 
 /* Loopback test source MAC address */
 static const unsigned char payload_source[ETH_ALEN] = {
@@ -161,23 +161,17 @@ static int efx_test_interrupts(struct efx_nic *efx,
 static int efx_test_eventq_irq(struct efx_channel *channel,
                                struct efx_self_tests *tests)
 {
-        unsigned int magic, count;
-
-        /* Channel specific code, limited to 20 bits */
-        magic = (0x00010150 + channel->channel);
-        EFX_LOG(channel->efx, "channel %d testing event queue with code %x\n",
-                channel->channel, magic);
+        unsigned int magic_count, count;
 
         tests->eventq_dma[channel->channel] = -1;
         tests->eventq_int[channel->channel] = -1;
         tests->eventq_poll[channel->channel] = -1;
 
-        /* Reset flag and zero magic word */
+        magic_count = channel->magic_count;
         channel->efx->last_irq_cpu = -1;
-        channel->eventq_magic = 0;
         smp_wmb();
 
-        efx_nic_generate_test_event(channel, magic);
+        efx_nic_generate_test_event(channel);
 
         /* Wait for arrival of interrupt */
         count = 0;
@@ -187,7 +181,7 @@ static int efx_test_eventq_irq(struct efx_channel *channel,
                 if (channel->work_pending)
                         efx_process_channel_now(channel);
 
-                if (channel->eventq_magic == magic)
+                if (channel->magic_count != magic_count)
                         goto eventq_ok;
         } while (++count < 2);
 
@@ -204,7 +198,7 @@ static int efx_test_eventq_irq(struct efx_channel *channel,
 
         /* Check to see if event was received even if interrupt wasn't */
         efx_process_channel_now(channel);
-        if (channel->eventq_magic == magic) {
+        if (channel->magic_count != magic_count) {
                 EFX_ERR(channel->efx, "channel %d event was generated, but "
                         "failed to trigger an interrupt\n", channel->channel);
                 tests->eventq_dma[channel->channel] = 1;
@@ -545,7 +539,7 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,
 static int efx_wait_for_link(struct efx_nic *efx)
 {
         struct efx_link_state *link_state = &efx->link_state;
-        int count;
+        int count, link_up_count = 0;
         bool link_up;
 
         for (count = 0; count < 40; count++) {
@@ -567,8 +561,12 @@ static int efx_wait_for_link(struct efx_nic *efx)
                         link_up = !efx->mac_op->check_fault(efx);
                 mutex_unlock(&efx->mac_lock);
 
-                if (link_up)
-                        return 0;
+                if (link_up) {
+                        if (++link_up_count == 2)
+                                return 0;
+                } else {
+                        link_up_count = 0;
+                }
         }
 
         return -ETIMEDOUT;
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index 727b4228e08..f2b1e618075 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -206,6 +206,7 @@ static int siena_probe_nic(struct efx_nic *efx)
 {
         struct siena_nic_data *nic_data;
         bool already_attached = 0;
+        efx_oword_t reg;
         int rc;
 
         /* Allocate storage for hardware specific data */
@@ -220,6 +221,9 @@ static int siena_probe_nic(struct efx_nic *efx)
                 goto fail1;
         }
 
+        efx_reado(efx, &reg, FR_AZ_CS_DEBUG);
+        efx->net_dev->dev_id = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1;
+
         efx_mcdi_init(efx);
 
         /* Recover from a failed assertion before probing */
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h
index 518f7fc9147..782e45a613d 100644
--- a/drivers/net/sfc/workarounds.h
+++ b/drivers/net/sfc/workarounds.h
@@ -54,7 +54,7 @@
 /* Increase filter depth to avoid RX_RESET */
 #define EFX_WORKAROUND_7244 EFX_WORKAROUND_FALCON_A
 /* Flushes may never complete */
-#define EFX_WORKAROUND_7803 EFX_WORKAROUND_FALCON_A
+#define EFX_WORKAROUND_7803 EFX_WORKAROUND_FALCON_AB
 /* Leak overlength packets rather than free */
 #define EFX_WORKAROUND_8071 EFX_WORKAROUND_FALCON_A
 
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 084eff21b67..61891a6cacc 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2161,21 +2161,21 @@ struct sky2_tx_le {
         __le16  length; /* also vlan tag or checksum start */
         u8      ctrl;
         u8      opcode;
-} __attribute((packed));
+} __packed;
 
 struct sky2_rx_le {
         __le32  addr;
         __le16  length;
         u8      ctrl;
         u8      opcode;
-} __attribute((packed));
+} __packed;
 
 struct sky2_status_le {
         __le32  status; /* also checksum */
         __le16  length; /* also vlan tag */
         u8      css;
         u8      opcode;
-} __attribute((packed));
+} __packed;
 
 struct tx_ring_info {
         struct sk_buff  *skb;
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 4591fe9bf0b..367e96f317d 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1131,8 +1131,8 @@ static int __devinit bigmac_ether_init(struct of_device *op,
                 goto fail_and_cleanup;
 
         /* Get supported SBUS burst sizes. */
-        bsizes = of_getintprop_default(qec_op->node, "burst-sizes", 0xff);
-        bsizes_more = of_getintprop_default(qec_op->node, "burst-sizes", 0xff);
+        bsizes = of_getintprop_default(qec_op->dev.of_node, "burst-sizes", 0xff);
+        bsizes_more = of_getintprop_default(qec_op->dev.of_node, "burst-sizes", 0xff);
 
         bsizes &= 0xff;
         if (bsizes_more != 0xff)
@@ -1184,7 +1184,7 @@ static int __devinit bigmac_ether_init(struct of_device *op,
         }
 
         /* Get the board revision of this BigMAC. */
-        bp->board_rev = of_getintprop_default(bp->bigmac_op->node,
+        bp->board_rev = of_getintprop_default(bp->bigmac_op->dev.of_node,
                                               "board-version", 1);
 
         /* Init auto-negotiation timer state. */
@@ -1290,8 +1290,11 @@ static const struct of_device_id bigmac_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, bigmac_sbus_match);
 
 static struct of_platform_driver bigmac_sbus_driver = {
-        .name           = "sunbmac",
-        .match_table    = bigmac_sbus_match,
+        .driver = {
+                .name = "sunbmac",
+                .owner = THIS_MODULE,
+                .of_match_table = bigmac_sbus_match,
+        },
         .probe          = bigmac_sbus_probe,
         .remove         = __devexit_p(bigmac_sbus_remove),
 };
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 915c5909c7a..3d9650b8d38 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2481,7 +2481,7 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
         else {
                 const struct linux_prom_registers *regs;
                 struct of_device *op = hp->happy_dev;
-                regs = of_get_property(op->node, "regs", NULL);
+                regs = of_get_property(op->dev.of_node, "regs", NULL);
                 if (regs)
                         sprintf(info->bus_info, "SBUS:%d",
                                 regs->which_io);
@@ -2641,14 +2641,14 @@ static const struct net_device_ops hme_netdev_ops = {
 #ifdef CONFIG_SBUS
 static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
 {
-        struct device_node *dp = op->node, *sbus_dp;
+        struct device_node *dp = op->dev.of_node, *sbus_dp;
         struct quattro *qp = NULL;
         struct happy_meal *hp;
         struct net_device *dev;
         int i, qfe_slot = -1;
         int err = -ENODEV;
 
-        sbus_dp = to_of_device(op->dev.parent)->node;
+        sbus_dp = to_of_device(op->dev.parent)->dev.of_node;
 
         /* We can match PCI devices too, do not accept those here. */
         if (strcmp(sbus_dp->name, "sbus"))
@@ -3237,7 +3237,7 @@ static void happy_meal_pci_exit(void)
 #ifdef CONFIG_SBUS
 static int __devinit hme_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
         const char *model = of_get_property(dp, "model", NULL);
         int is_qfe = (match->data != NULL);
 
@@ -3291,8 +3291,11 @@ static const struct of_device_id hme_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, hme_sbus_match);
 
 static struct of_platform_driver hme_sbus_driver = {
-        .name           = "hme",
-        .match_table    = hme_sbus_match,
+        .driver = {
+                .name = "hme",
+                .owner = THIS_MODULE,
+                .of_match_table = hme_sbus_match,
+        },
         .probe          = hme_sbus_probe,
         .remove         = __devexit_p(hme_sbus_remove),
 };
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 386af7bbe67..7d9c33dd9d1 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1323,7 +1323,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op,
                                            struct of_device *ledma,
                                            struct of_device *lebuffer)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
         static unsigned version_printed;
         struct lance_private *lp;
         struct net_device *dev;
@@ -1410,7 +1410,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op,
 
         lp->burst_sizes = 0;
         if (lp->ledma) {
-                struct device_node *ledma_dp = ledma->node;
+                struct device_node *ledma_dp = ledma->dev.of_node;
                 struct device_node *sbus_dp;
                 unsigned int sbmask;
                 const char *prop;
@@ -1506,7 +1506,7 @@ fail:
 static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
         struct of_device *parent = to_of_device(op->dev.parent);
-        struct device_node *parent_dp = parent->node;
+        struct device_node *parent_dp = parent->dev.of_node;
         int err;
 
         if (!strcmp(parent_dp->name, "ledma")) {
@@ -1545,8 +1545,11 @@ static const struct of_device_id sunlance_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, sunlance_sbus_match);
 
 static struct of_platform_driver sunlance_sbus_driver = {
-        .name           = "sunlance",
-        .match_table    = sunlance_sbus_match,
+        .driver = {
+                .name = "sunlance",
+                .owner = THIS_MODULE,
+                .of_match_table = sunlance_sbus_match,
+        },
         .probe          = sunlance_sbus_probe,
         .remove         = __devexit_p(sunlance_sbus_remove),
 };
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index a7542d25c84..72b579c8d81 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -695,7 +695,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
         strcpy(info->version, "3.0");
 
         op = qep->op;
-        regs = of_get_property(op->node, "reg", NULL);
+        regs = of_get_property(op->dev.of_node, "reg", NULL);
         if (regs)
                 sprintf(info->bus_info, "SBUS:%d", regs->which_io);
 
@@ -799,7 +799,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child)
                         if (qec_global_reset(qecp->gregs))
                                 goto fail;
 
-                        qecp->qec_bursts = qec_get_burst(op->node);
+                        qecp->qec_bursts = qec_get_burst(op->dev.of_node);
 
                         qec_init_once(qecp, op);
 
@@ -857,7 +857,7 @@ static int __devinit qec_ether_init(struct of_device *op)
 
         res = -ENODEV;
 
-        i = of_getintprop_default(op->node, "channel#", -1);
+        i = of_getintprop_default(op->dev.of_node, "channel#", -1);
         if (i == -1)
                 goto fail;
         qe->channel = i;
@@ -977,8 +977,11 @@ static const struct of_device_id qec_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, qec_sbus_match);
 
 static struct of_platform_driver qec_sbus_driver = {
-        .name           = "qec",
-        .match_table    = qec_sbus_match,
+        .driver = {
+                .name = "qec",
+                .owner = THIS_MODULE,
+                .of_match_table = qec_sbus_match,
+        },
         .probe          = qec_sbus_probe,
         .remove         = __devexit_p(qec_sbus_remove),
 };
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 20ab1619232..737df6032bb 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -646,7 +646,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
                 error = copy_from_user(data, ifr->ifr_data, sizeof(data));
                 if (error) {
                         pr_err("cant copy from user\n");
-                        RET(error);
+                        RET(-EFAULT);
                 }
                 DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]);
         }
@@ -665,7 +665,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
                     data[2]);
                 error = copy_to_user(ifr->ifr_data, data, sizeof(data));
                 if (error)
-                        RET(error);
+                        RET(-EFAULT);
                 break;
 
         case BDX_OP_WRITE:
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index cff98d07cba..67e3b71bf70 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -334,7 +334,7 @@ struct txd_desc {
         u32 va_lo;
         u32 va_hi;
         struct pbl pbl[0];      /* Fragments */
-} __attribute__ ((packed));
+} __packed;
 
 /* Register region size */
 #define BDX_REGS_SIZE     0x1000
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 573054ae7b5..289cdc5fde9 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -67,8 +67,8 @@
 #include "tg3.h"
 
 #define DRV_MODULE_NAME         "tg3"
-#define DRV_MODULE_VERSION      "3.110"
-#define DRV_MODULE_RELDATE      "April 9, 2010"
+#define DRV_MODULE_VERSION      "3.111"
+#define DRV_MODULE_RELDATE      "June 5, 2010"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -145,8 +145,6 @@
 #define TG3_RX_JMB_BUFF_RING_SIZE \
         (sizeof(struct ring_info) * TG3_RX_JUMBO_RING_SIZE)
 
-#define TG3_RSS_MIN_NUM_MSIX_VECS       2
-
 /* Due to a hardware bug, the 5701 can only DMA to memory addresses
  * that are at least dword aligned when used in PCIX mode.  The driver
  * works around this bug by double copying the packet.  This workaround
@@ -272,6 +270,7 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57765)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57791)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57795)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5719)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)},
@@ -585,18 +584,23 @@ static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
 static void tg3_ape_lock_init(struct tg3 *tp)
 {
         int i;
+        u32 regbase;
+
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761)
+                regbase = TG3_APE_LOCK_GRANT;
+        else
+                regbase = TG3_APE_PER_LOCK_GRANT;
 
         /* Make sure the driver hasn't any stale locks. */
         for (i = 0; i < 8; i++)
-                tg3_ape_write32(tp, TG3_APE_LOCK_GRANT + 4 * i,
-                                APE_LOCK_GRANT_DRIVER);
+                tg3_ape_write32(tp, regbase + 4 * i, APE_LOCK_GRANT_DRIVER);
 }
 
 static int tg3_ape_lock(struct tg3 *tp, int locknum)
 {
         int i, off;
         int ret = 0;
-        u32 status;
+        u32 status, req, gnt;
 
         if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE))
                 return 0;
@@ -609,13 +613,21 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
                 return -EINVAL;
         }
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761) {
+                req = TG3_APE_LOCK_REQ;
+                gnt = TG3_APE_LOCK_GRANT;
+        } else {
+                req = TG3_APE_PER_LOCK_REQ;
+                gnt = TG3_APE_PER_LOCK_GRANT;
+        }
+
         off = 4 * locknum;
 
-        tg3_ape_write32(tp, TG3_APE_LOCK_REQ + off, APE_LOCK_REQ_DRIVER);
+        tg3_ape_write32(tp, req + off, APE_LOCK_REQ_DRIVER);
 
         /* Wait for up to 1 millisecond to acquire lock. */
         for (i = 0; i < 100; i++) {
-                status = tg3_ape_read32(tp, TG3_APE_LOCK_GRANT + off);
+                status = tg3_ape_read32(tp, gnt + off);
                 if (status == APE_LOCK_GRANT_DRIVER)
                         break;
                 udelay(10);
@@ -623,7 +635,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
 
         if (status != APE_LOCK_GRANT_DRIVER) {
                 /* Revoke the lock request. */
-                tg3_ape_write32(tp, TG3_APE_LOCK_GRANT + off,
+                tg3_ape_write32(tp, gnt + off,
                                 APE_LOCK_GRANT_DRIVER);
 
                 ret = -EBUSY;
@@ -634,7 +646,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
 
 static void tg3_ape_unlock(struct tg3 *tp, int locknum)
 {
-        int off;
+        u32 gnt;
 
         if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE))
                 return;
@@ -647,8 +659,12 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)
                 return;
         }
 
-        off = 4 * locknum;
-        tg3_ape_write32(tp, TG3_APE_LOCK_GRANT + off, APE_LOCK_GRANT_DRIVER);
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761)
+                gnt = TG3_APE_LOCK_GRANT;
+        else
+                gnt = TG3_APE_PER_LOCK_GRANT;
+
+        tg3_ape_write32(tp, gnt + 4 * locknum, APE_LOCK_GRANT_DRIVER);
 }
 
 static void tg3_disable_ints(struct tg3 *tp)
@@ -1069,14 +1085,11 @@ static int tg3_mdio_init(struct tg3 *tp)
         u32 reg;
         struct phy_device *phydev;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
-                u32 funcnum, is_serdes;
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                u32 is_serdes;
 
-                funcnum = tr32(TG3_CPMU_STATUS) & TG3_CPMU_STATUS_PCIE_FUNC;
-                if (funcnum)
-                        tp->phy_addr = 2;
-                else
-                        tp->phy_addr = 1;
+                tp->phy_addr = PCI_FUNC(tp->pdev->devfn) + 1;
 
                 if (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
                         is_serdes = tr32(SG_DIG_STATUS) & SG_DIG_IS_SERDES;
@@ -1589,7 +1602,8 @@ static void tg3_phy_toggle_apd(struct tg3 *tp, bool enable)
         u32 reg;
 
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
-                (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+            ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) &&
              (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
                 return;
 
@@ -1964,7 +1978,8 @@ static int tg3_phy_reset(struct tg3 *tp)
                 }
         }
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) &&
             (tp->tg3_flags2 & TG3_FLG2_MII_SERDES))
                 return 0;
 
@@ -2049,6 +2064,7 @@ static void tg3_frob_aux_power(struct tg3 *tp)
 
         /* The GPIOs do something completely different on 57765. */
         if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 return;
 
@@ -4191,6 +4207,8 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
                                         current_duplex = DUPLEX_FULL;
                                 else
                                         current_duplex = DUPLEX_HALF;
+                        } else if (!(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
+                                /* Link is up via parallel detect */
                         } else {
                                 current_link_up = 0;
                         }
@@ -6212,6 +6230,8 @@ static void tg3_free_rings(struct tg3 *tp)
         for (j = 0; j < tp->irq_cnt; j++) {
                 struct tg3_napi *tnapi = &tp->napi[j];
 
+                tg3_rx_prodring_free(tp, &tp->prodring[j]);
+
                 if (!tnapi->tx_buffers)
                         continue;
 
@@ -6247,8 +6267,6 @@ static void tg3_free_rings(struct tg3 *tp)
 
                         dev_kfree_skb_any(skb);
                 }
-
-                tg3_rx_prodring_free(tp, &tp->prodring[j]);
         }
 }
 
@@ -6782,7 +6800,8 @@ static void tg3_restore_pci_state(struct tg3 *tp)
         /* Allow reads and writes to the APE register and memory space. */
         if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
                 val |= PCISTATE_ALLOW_APE_CTLSPC_WR |
-                       PCISTATE_ALLOW_APE_SHMEM_WR;
+                       PCISTATE_ALLOW_APE_SHMEM_WR |
+                       PCISTATE_ALLOW_APE_PSPACE_WR;
         pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, val);
 
         pci_write_config_word(tp->pdev, PCI_COMMAND, tp->pci_cmd);
@@ -7069,6 +7088,7 @@ static int tg3_chip_reset(struct tg3 *tp)
             tp->pci_chip_rev_id != CHIPREV_ID_5750_A0 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57765) {
                 val = tr32(0x7c00);
 
@@ -7504,7 +7524,8 @@ static void tg3_rings_reset(struct tg3 *tp)
 
 
         /* Disable all receive return rings but the first. */
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                 limit = NIC_SRAM_RCV_RET_RCB + TG3_BDINFO_SIZE * 17;
         else if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
                 limit = NIC_SRAM_RCV_RET_RCB + TG3_BDINFO_SIZE * 16;
@@ -7720,7 +7741,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                  */
                 val = tr32(TG3PCI_PCISTATE);
                 val |= PCISTATE_ALLOW_APE_CTLSPC_WR |
-                       PCISTATE_ALLOW_APE_SHMEM_WR;
+                       PCISTATE_ALLOW_APE_SHMEM_WR |
+                       PCISTATE_ALLOW_APE_PSPACE_WR;
                 tw32(TG3PCI_PCISTATE, val);
         }
 
@@ -7741,6 +7763,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 return err;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
                 val = tr32(TG3PCI_DMA_RW_CTRL) &
                       ~DMA_RWCTRL_DIS_CACHE_ALIGNMENT;
@@ -7869,7 +7892,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
              ((u64) tpr->rx_std_mapping >> 32));
         tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
              ((u64) tpr->rx_std_mapping & 0xffffffff));
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
                 tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
                      NIC_SRAM_RX_BUFFER_DESC);
 
@@ -7894,7 +7918,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                         tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,
                              (RX_JUMBO_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT) |
                              BDINFO_FLAGS_USE_EXT_RECV);
-                        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)
+                        if (!(tp->tg3_flags3 & TG3_FLG3_USE_JUMBO_BDFLAG) ||
+                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                                 tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_NIC_ADDR,
                                      NIC_SRAM_RX_JUMBO_BUFFER_DESC);
                 } else {
@@ -7903,6 +7928,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 }
 
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                         val = (RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT) |
                               (TG3_RX_STD_DMA_SZ << 2);
@@ -7921,6 +7947,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tw32_rx_mbox(TG3_RX_JMB_PROD_IDX_REG, tpr->rx_jmb_prod_idx);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
                 tw32(STD_REPLENISH_LWM, 32);
                 tw32(JMB_REPLENISH_LWM, 16);
@@ -7956,7 +7983,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                       RDMAC_MODE_FIFOURUN_ENAB | RDMAC_MODE_FIFOOREAD_ENAB |
                       RDMAC_MODE_LNGREAD_ENAB);
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                 rdmac_mode |= RDMAC_MODE_MULT_DMA_RD_DIS;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
@@ -8195,6 +8223,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         }
 
         tp->tx_mode = TX_MODE_ENABLE;
+        if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
+                tp->tx_mode |= TX_MODE_MBUF_LOCKUP_FIX;
         tw32_f(MAC_TX_MODE, tp->tx_mode);
         udelay(100);
 
@@ -8206,7 +8237,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 for (i = 0; i < TG3_RSS_INDIR_TBL_SIZE; i++) {
                         int idx = i % sizeof(val);
 
-                        ent[idx] = i % (tp->irq_cnt - 1);
+                        ent[idx] = (i % (tp->irq_cnt - 1)) + 1;
                         if (idx == sizeof(val) - 1) {
                                 tw32(reg, val);
                                 reg += 4;
@@ -8511,8 +8542,10 @@ static void tg3_timer(unsigned long __opaque)
                                 }
                                 tg3_setup_phy(tp, 0);
                         }
-                } else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)
+                } else if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) &&
+                           !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
                         tg3_serdes_parallel_detect(tp);
+                }
 
                 tp->timer_counter = tp->timer_multiplier;
         }
@@ -8606,6 +8639,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
          * observable way to know whether the interrupt was delivered.
          */
         if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) &&
             (tp->tg3_flags2 & TG3_FLG2_USING_MSI)) {
                 val = tr32(MSGINT_MODE) | MSGINT_MODE_ONE_SHOT_DISABLE;
@@ -8650,6 +8684,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
         if (intr_ok) {
                 /* Reenable MSI one shot mode. */
                 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
                      GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) &&
                     (tp->tg3_flags2 & TG3_FLG2_USING_MSI)) {
                         val = tr32(MSGINT_MODE) & ~MSGINT_MODE_ONE_SHOT_DISABLE;
@@ -8775,9 +8810,9 @@ static bool tg3_enable_msix(struct tg3 *tp)
         }
 
         rc = pci_enable_msix(tp->pdev, msix_ent, tp->irq_cnt);
-        if (rc != 0) {
-                if (rc < TG3_RSS_MIN_NUM_MSIX_VECS)
-                        return false;
+        if (rc < 0) {
+                return false;
+        } else if (rc != 0) {
                 if (pci_enable_msix(tp->pdev, msix_ent, rc))
                         return false;
                 netdev_notice(tp->dev, "Requested %d MSI-X vectors, received %d\n",
@@ -8785,16 +8820,19 @@ static bool tg3_enable_msix(struct tg3 *tp)
                 tp->irq_cnt = rc;
         }
 
-        tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS;
-
         for (i = 0; i < tp->irq_max; i++)
                 tp->napi[i].irq_vec = msix_ent[i].vector;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
-                tp->tg3_flags3 |= TG3_FLG3_ENABLE_TSS;
-                tp->dev->real_num_tx_queues = tp->irq_cnt - 1;
-        } else
-                tp->dev->real_num_tx_queues = 1;
+        tp->dev->real_num_tx_queues = 1;
+        if (tp->irq_cnt > 1) {
+                tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS;
+
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                        tp->tg3_flags3 |= TG3_FLG3_ENABLE_TSS;
+                        tp->dev->real_num_tx_queues = tp->irq_cnt - 1;
+                }
+        }
 
         return true;
 }
@@ -8943,6 +8981,7 @@ static int tg3_open(struct net_device *dev)
                 }
 
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
+                    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719 &&
                     GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57765 &&
                     (tp->tg3_flags2 & TG3_FLG2_USING_MSI) &&
                     (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)) {
@@ -10554,7 +10593,8 @@ static int tg3_test_memory(struct tg3 *tp)
         int err = 0;
         int i;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                 mem_tbl = mem_tbl_5717;
         else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 mem_tbl = mem_tbl_57765;
@@ -11634,7 +11674,8 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
                 else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
                          GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                         tg3_get_57780_nvram_info(tp);
-                else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+                else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                         GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
                         tg3_get_5717_nvram_info(tp);
                 else
                         tg3_get_nvram_info(tp);
@@ -12070,11 +12111,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 
                 tp->phy_id = eeprom_phy_id;
                 if (eeprom_phy_serdes) {
-                        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) ||
-                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
-                                tp->tg3_flags2 |= TG3_FLG2_MII_SERDES;
-                        else
+                        if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
                                 tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
+                        else
+                                tp->tg3_flags2 |= TG3_FLG2_MII_SERDES;
                 }
 
                 if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
@@ -12804,7 +12844,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 
                 if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717 ||
                     tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
-                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5724)
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5724 ||
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719)
                         pci_read_config_dword(tp->pdev,
                                               TG3PCI_GEN2_PRODID_ASICREV,
                                               &prod_id_asic_rev);
@@ -12970,6 +13011,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 tp->tg3_flags3 |= TG3_FLG3_5755_PLUS;
 
@@ -12999,6 +13041,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 
         /* Determine TSO capabilities */
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
         else if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
@@ -13036,6 +13079,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 }
 
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
                         tp->tg3_flags |= TG3_FLAG_SUPPORT_MSIX;
                         tp->irq_max = TG3_IRQ_MAX_VECS;
@@ -13043,6 +13087,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         }
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 tp->tg3_flags3 |= TG3_FLG3_SHORT_DMA_BUG;
         else if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS)) {
@@ -13051,6 +13096,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         }
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG;
 
@@ -13242,7 +13288,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                  * APE register and memory space.
                  */
                 pci_state_reg |= PCISTATE_ALLOW_APE_CTLSPC_WR |
-                                 PCISTATE_ALLOW_APE_SHMEM_WR;
+                                 PCISTATE_ALLOW_APE_SHMEM_WR |
+                                 PCISTATE_ALLOW_APE_PSPACE_WR;
                 pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE,
                                        pci_state_reg);
         }
@@ -13252,6 +13299,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 tp->tg3_flags |= TG3_FLAG_CPMU_PRESENT;
 
@@ -13332,6 +13380,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57780 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57765) {
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787 ||
@@ -13580,9 +13629,12 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
                         tw32_f(NVRAM_CMD, NVRAM_CMD_RESET);
                 else
                         tg3_nvram_unlock(tp);
-        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
-                if (tr32(TG3_CPMU_STATUS) & TG3_CPMU_STATUS_PCIE_FUNC)
+        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+                   GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
+                if (PCI_FUNC(tp->pdev->devfn) & 1)
                         mac_offset = 0xcc;
+                if (PCI_FUNC(tp->pdev->devfn) > 1)
+                        mac_offset += 0x18c;
         } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 mac_offset = 0x10;
 
@@ -13668,6 +13720,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val)
 #endif
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
                 val = goal ? 0 : DMA_RWCTRL_DIS_CACHE_ALIGNMENT;
                 goto out;
@@ -13880,6 +13933,7 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
         tp->dma_rwctrl = tg3_calc_dma_bndry(tp, tp->dma_rwctrl);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 goto out;
 
@@ -14079,6 +14133,7 @@ static void __devinit tg3_init_link_config(struct tg3 *tp)
 static void __devinit tg3_init_bufmgr_config(struct tg3 *tp)
 {
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {
                 tp->bufmgr_config.mbuf_read_dma_low_water =
                         DEFAULT_MB_RDMA_LOW_WATER_5705;
@@ -14156,6 +14211,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp)
         case TG3_PHY_ID_BCM5718C:       return "5718C";
         case TG3_PHY_ID_BCM5718S:       return "5718S";
         case TG3_PHY_ID_BCM57765:       return "57765";
+        case TG3_PHY_ID_BCM5719C:       return "5719C";
         case TG3_PHY_ID_BCM8002:        return "8002/serdes";
         case 0:                 return "serdes";
         default:                return "unknown";
@@ -14404,7 +14460,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         }
 
         if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) &&
-            tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
+            tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
                 dev->netdev_ops = &tg3_netdev_ops;
         else
                 dev->netdev_ops = &tg3_netdev_ops_dma_bug;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index ce9c4918c31..6b6af7698b3 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -53,6 +53,7 @@
 #define  TG3PCI_DEVICE_TIGON3_57765      0x16b4
 #define  TG3PCI_DEVICE_TIGON3_57791      0x16b2
 #define  TG3PCI_DEVICE_TIGON3_57795      0x16b6
+#define  TG3PCI_DEVICE_TIGON3_5719       0x1657
 /* 0x04 --> 0x2c unused */
 #define TG3PCI_SUBVENDOR_ID_BROADCOM            PCI_VENDOR_ID_BROADCOM
 #define TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6    0x1644
@@ -160,6 +161,7 @@
 #define   ASIC_REV_57780                 0x57780
 #define   ASIC_REV_5717                  0x5717
 #define   ASIC_REV_57765                 0x57785
+#define   ASIC_REV_5719                  0x5719
 #define  GET_CHIP_REV(CHIP_REV_ID)      ((CHIP_REV_ID) >> 8)
 #define   CHIPREV_5700_AX                0x70
 #define   CHIPREV_5700_BX                0x71
@@ -231,6 +233,7 @@
 #define  PCISTATE_RETRY_SAME_DMA         0x00002000
 #define  PCISTATE_ALLOW_APE_CTLSPC_WR    0x00010000
 #define  PCISTATE_ALLOW_APE_SHMEM_WR     0x00020000
+#define  PCISTATE_ALLOW_APE_PSPACE_WR    0x00040000
 #define TG3PCI_CLOCK_CTRL               0x00000074
 #define  CLOCK_CTRL_CORECLK_DISABLE      0x00000200
 #define  CLOCK_CTRL_RXCLK_DISABLE        0x00000400
@@ -468,6 +471,7 @@
 #define  TX_MODE_FLOW_CTRL_ENABLE        0x00000010
 #define  TX_MODE_BIG_BCKOFF_ENABLE       0x00000020
 #define  TX_MODE_LONG_PAUSE_ENABLE       0x00000040
+#define  TX_MODE_MBUF_LOCKUP_FIX         0x00000100
 #define MAC_TX_STATUS                   0x00000460
 #define  TX_STATUS_XOFFED                0x00000001
 #define  TX_STATUS_SENT_XOFF             0x00000002
@@ -1071,10 +1075,8 @@
 #define TG3_CPMU_HST_ACC                0x0000361c
 #define  CPMU_HST_ACC_MACCLK_MASK        0x001f0000
 #define  CPMU_HST_ACC_MACCLK_6_25        0x00130000
-/* 0x3620 --> 0x362c unused */
+/* 0x3620 --> 0x3630 unused */
 
-#define TG3_CPMU_STATUS                 0x0000362c
-#define  TG3_CPMU_STATUS_PCIE_FUNC       0x20000000
 #define TG3_CPMU_CLCK_STAT              0x00003630
 #define  CPMU_CLCK_STAT_MAC_CLCK_MASK    0x001f0000
 #define  CPMU_CLCK_STAT_MAC_CLCK_62_5    0x00000000
@@ -2209,6 +2211,11 @@
 #define  APE_EVENT_STATUS_STATE_SUSPEND  0x00040000
 #define  APE_EVENT_STATUS_EVENT_PENDING  0x80000000
 
+#define TG3_APE_PER_LOCK_REQ            0x8400
+#define  APE_LOCK_PER_REQ_DRIVER         0x00001000
+#define TG3_APE_PER_LOCK_GRANT          0x8420
+#define  APE_PER_LOCK_GRANT_DRIVER       0x00001000
+
 /* APE convenience enumerations. */
 #define TG3_APE_LOCK_GRC                1
 #define TG3_APE_LOCK_MEM                4
@@ -2942,6 +2949,7 @@ struct tg3 {
 #define TG3_PHY_ID_BCM5718C             0x5c0d8a00
 #define TG3_PHY_ID_BCM5718S             0xbc050ff0
 #define TG3_PHY_ID_BCM57765             0x5c0d8a40
+#define TG3_PHY_ID_BCM5719C             0x5c0d8a20
 #define TG3_PHY_ID_BCM5906              0xdc00ac40
 #define TG3_PHY_ID_BCM8002              0x60010140
 #define TG3_PHY_ID_INVALID              0xffffffff
@@ -2965,7 +2973,8 @@ struct tg3 {
          (X) == TG3_PHY_ID_BCM5755 || (X) == TG3_PHY_ID_BCM5756 || \
          (X) == TG3_PHY_ID_BCM5906 || (X) == TG3_PHY_ID_BCM5761 || \
          (X) == TG3_PHY_ID_BCM5718C || (X) == TG3_PHY_ID_BCM5718S || \
-         (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM8002)
+         (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM5719C || \
+         (X) == TG3_PHY_ID_BCM8002)
 
         u32                             led_ctrl;
         u32                             phy_otp;
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index c0e70006374..96096266007 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -262,13 +262,13 @@ struct de_srom_media_block {
         u16                     csr13;
         u16                     csr14;
         u16                     csr15;
-} __attribute__((packed));
+} __packed;
 
 struct de_srom_info_leaf {
         u16                     default_media;
         u8                      n_blocks;
         u8                      unused;
-} __attribute__((packed));
+} __packed;
 
 struct de_desc {
         __le32                  opts1;
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 6002e651b9e..3031ed9c4a1 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -120,8 +120,8 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
                           0x00, 0x06  /* ttm bit map */
                         };
 
-                tp->mtable = (struct mediatable *)
-                        kmalloc(sizeof(struct mediatable) + sizeof(struct medialeaf), GFP_KERNEL);
+                tp->mtable = kmalloc(sizeof(struct mediatable) +
+                                     sizeof(struct medialeaf), GFP_KERNEL);
 
                 if (tp->mtable == NULL)
                         return; /* Horrible, impossible failure. */
@@ -227,9 +227,9 @@ subsequent_board:
                         return;
                 }
 
-                mtable = (struct mediatable *)
-                        kmalloc(sizeof(struct mediatable) + count*sizeof(struct medialeaf),
-                                        GFP_KERNEL);
+                mtable = kmalloc(sizeof(struct mediatable) +
+                                 count * sizeof(struct medialeaf),
+                                 GFP_KERNEL);
                 if (mtable == NULL)
                         return;                         /* Horrible, impossible failure. */
                 last_mediatable = tp->mtable = mtable;
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 0afa2d4f947..e525875ed67 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -20,6 +20,7 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <linux/netdevice.h>
+#include <linux/ethtool.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
@@ -51,22 +52,23 @@ struct tulip_chip_table {
 
 
 enum tbl_flag {
-        HAS_MII                 = 0x0001,
-        HAS_MEDIA_TABLE         = 0x0002,
-        CSR12_IN_SROM           = 0x0004,
-        ALWAYS_CHECK_MII        = 0x0008,
-        HAS_ACPI                = 0x0010,
-        MC_HASH_ONLY            = 0x0020, /* Hash-only multicast filter. */
-        HAS_PNICNWAY            = 0x0080,
-        HAS_NWAY                = 0x0040, /* Uses internal NWay xcvr. */
-        HAS_INTR_MITIGATION     = 0x0100,
-        IS_ASIX                 = 0x0200,
-        HAS_8023X               = 0x0400,
-        COMET_MAC_ADDR          = 0x0800,
-        HAS_PCI_MWI             = 0x1000,
-        HAS_PHY_IRQ             = 0x2000,
-        HAS_SWAPPED_SEEPROM     = 0x4000,
-        NEEDS_FAKE_MEDIA_TABLE  = 0x8000,
+        HAS_MII                 = 0x00001,
+        HAS_MEDIA_TABLE         = 0x00002,
+        CSR12_IN_SROM           = 0x00004,
+        ALWAYS_CHECK_MII        = 0x00008,
+        HAS_ACPI                = 0x00010,
+        MC_HASH_ONLY            = 0x00020, /* Hash-only multicast filter. */
+        HAS_PNICNWAY            = 0x00080,
+        HAS_NWAY                = 0x00040, /* Uses internal NWay xcvr. */
+        HAS_INTR_MITIGATION     = 0x00100,
+        IS_ASIX                 = 0x00200,
+        HAS_8023X               = 0x00400,
+        COMET_MAC_ADDR          = 0x00800,
+        HAS_PCI_MWI             = 0x01000,
+        HAS_PHY_IRQ             = 0x02000,
+        HAS_SWAPPED_SEEPROM     = 0x04000,
+        NEEDS_FAKE_MEDIA_TABLE  = 0x08000,
+        COMET_PM                = 0x10000,
 };
 
 
@@ -120,6 +122,11 @@ enum tulip_offsets {
         CSR13 = 0x68,
         CSR14 = 0x70,
         CSR15 = 0x78,
+        CSR18 = 0x88,
+        CSR19 = 0x8c,
+        CSR20 = 0x90,
+        CSR27 = 0xAC,
+        CSR28 = 0xB0,
 };
 
 /* register offset and bits for CFDD PCI config reg */
@@ -289,6 +296,30 @@ enum t21143_csr6_bits {
         csr6_mask_100bt = (csr6_scr | csr6_pcs | csr6_hbd),
 };
 
+enum tulip_comet_csr13_bits {
+/* The LINKOFFE and LINKONE work in conjunction with LSCE, i.e. they
+ * determine which link status transition wakes up if LSCE is
+ * enabled */
+        comet_csr13_linkoffe = (1 << 17),
+        comet_csr13_linkone = (1 << 16),
+        comet_csr13_wfre = (1 << 10),
+        comet_csr13_mpre = (1 << 9),
+        comet_csr13_lsce = (1 << 8),
+        comet_csr13_wfr = (1 << 2),
+        comet_csr13_mpr = (1 << 1),
+        comet_csr13_lsc = (1 << 0),
+};
+
+enum tulip_comet_csr18_bits {
+        comet_csr18_pmes_sticky = (1 << 24),
+        comet_csr18_pm_mode = (1 << 19),
+        comet_csr18_apm_mode = (1 << 18),
+        comet_csr18_d3a = (1 << 7)
+};
+
+enum tulip_comet_csr20_bits {
+        comet_csr20_pmes = (1 << 15),
+};
 
 /* Keep the ring sizes a power of two for efficiency.
    Making the Tx ring too large decreases the effectiveness of channel
@@ -411,6 +442,7 @@ struct tulip_private {
         unsigned int csr6;      /* Current CSR6 control settings. */
         unsigned char eeprom[EEPROM_SIZE];      /* Serial EEPROM contents. */
         void (*link_change) (struct net_device * dev, int csr5);
+        struct ethtool_wolinfo wolinfo;        /* WOL settings */
         u16 sym_advertise, mii_advertise; /* NWay capabilities advertised.  */
         u16 lpar;               /* 21143 Link partner ability. */
         u16 advertising[4];
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 254643ed945..03e96b928c0 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -30,7 +30,6 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
-#include <linux/ethtool.h>
 #include <linux/crc32.h>
 #include <asm/unaligned.h>
 #include <asm/uaccess.h>
@@ -272,6 +271,7 @@ static void tulip_down(struct net_device *dev);
 static struct net_device_stats *tulip_get_stats(struct net_device *dev);
 static int private_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void set_rx_mode(struct net_device *dev);
+static void tulip_set_wolopts(struct pci_dev *pdev, u32 wolopts);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void poll_tulip(struct net_device *dev);
 #endif
@@ -309,6 +309,11 @@ static void tulip_up(struct net_device *dev)
         /* Wake the chip from sleep/snooze mode. */
         tulip_set_power_state (tp, 0, 0);
 
+        /* Disable all WOL events */
+        pci_enable_wake(tp->pdev, PCI_D3hot, 0);
+        pci_enable_wake(tp->pdev, PCI_D3cold, 0);
+        tulip_set_wolopts(tp->pdev, 0);
+
         /* On some chip revs we must set the MII/SYM port before the reset!? */
         if (tp->mii_cnt  ||  (tp->mtable  &&  tp->mtable->has_mii))
                 iowrite32(0x00040000, ioaddr + CSR6);
@@ -345,8 +350,8 @@ static void tulip_up(struct net_device *dev)
                 } else if (tp->flags & COMET_MAC_ADDR) {
                         iowrite32(addr_low,  ioaddr + 0xA4);
                         iowrite32(addr_high, ioaddr + 0xA8);
-                        iowrite32(0, ioaddr + 0xAC);
-                        iowrite32(0, ioaddr + 0xB0);
+                        iowrite32(0, ioaddr + CSR27);
+                        iowrite32(0, ioaddr + CSR28);
                 }
         } else {
                 /* This is set_rx_mode(), but without starting the transmitter. */
@@ -876,8 +881,35 @@ static void tulip_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *in
         strcpy(info->bus_info, pci_name(np->pdev));
 }
 
+
+static int tulip_ethtool_set_wol(struct net_device *dev,
+                                 struct ethtool_wolinfo *wolinfo)
+{
+        struct tulip_private *tp = netdev_priv(dev);
+
+        if (wolinfo->wolopts & (~tp->wolinfo.supported))
+                   return -EOPNOTSUPP;
+
+        tp->wolinfo.wolopts = wolinfo->wolopts;
+        device_set_wakeup_enable(&tp->pdev->dev, tp->wolinfo.wolopts);
+        return 0;
+}
+
+static void tulip_ethtool_get_wol(struct net_device *dev,
+                                  struct ethtool_wolinfo *wolinfo)
+{
+        struct tulip_private *tp = netdev_priv(dev);
+
+        wolinfo->supported = tp->wolinfo.supported;
+        wolinfo->wolopts = tp->wolinfo.wolopts;
+        return;
+}
+
+
 static const struct ethtool_ops ops = {
-        .get_drvinfo = tulip_get_drvinfo
+        .get_drvinfo = tulip_get_drvinfo,
+        .set_wol     = tulip_ethtool_set_wol,
+        .get_wol     = tulip_ethtool_get_wol,
 };
 
 /* Provide ioctl() calls to examine the MII xcvr state. */
@@ -1093,8 +1125,8 @@ static void set_rx_mode(struct net_device *dev)
                                 iowrite32(3, ioaddr + CSR13);
                                 iowrite32(mc_filter[1], ioaddr + CSR14);
                         } else if (tp->flags & COMET_MAC_ADDR) {
-                                iowrite32(mc_filter[0], ioaddr + 0xAC);
-                                iowrite32(mc_filter[1], ioaddr + 0xB0);
+                                iowrite32(mc_filter[0], ioaddr + CSR27);
+                                iowrite32(mc_filter[1], ioaddr + CSR28);
                         }
                         tp->mc_filter[0] = mc_filter[0];
                         tp->mc_filter[1] = mc_filter[1];
@@ -1381,6 +1413,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                 return i;
         }
 
+        /* The chip will fail to enter a low-power state later unless
+         * first explicitly commanded into D0 */
+        if (pci_set_power_state(pdev, PCI_D0)) {
+                printk (KERN_NOTICE PFX
+                        "Failed to set power state to D0\n");
+        }
+
         irq = pdev->irq;
 
         /* alloc_etherdev ensures aligned and zeroed private structures */
@@ -1427,6 +1466,19 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         tp->chip_id = chip_idx;
         tp->flags = tulip_tbl[chip_idx].flags;
+
+        tp->wolinfo.supported = 0;
+        tp->wolinfo.wolopts = 0;
+        /* COMET: Enable power management only for AN983B */
+        if (chip_idx == COMET ) {
+                u32 sig;
+                pci_read_config_dword (pdev, 0x80, &sig);
+                if (sig == 0x09811317) {
+                        tp->flags |= COMET_PM;
+                        tp->wolinfo.supported = WAKE_PHY | WAKE_MAGIC;
+                        printk(KERN_INFO "tulip_init_one: Enabled WOL support for AN983B\n");
+                }
+        }
         tp->pdev = pdev;
         tp->base_addr = ioaddr;
         tp->revision = pdev->revision;
@@ -1759,11 +1811,43 @@ err_out_free_netdev:
 }
 
 
+/* set the registers according to the given wolopts */
+static void tulip_set_wolopts (struct pci_dev *pdev, u32 wolopts)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct tulip_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->base_addr;
+
+        if (tp->flags & COMET_PM) {
+          
+                unsigned int tmp;
+                        
+                tmp = ioread32(ioaddr + CSR18);
+                tmp &= ~(comet_csr18_pmes_sticky | comet_csr18_apm_mode | comet_csr18_d3a);
+                tmp |= comet_csr18_pm_mode;
+                iowrite32(tmp, ioaddr + CSR18);
+                        
+                /* Set the Wake-up Control/Status Register to the given WOL options*/
+                tmp = ioread32(ioaddr + CSR13);
+                tmp &= ~(comet_csr13_linkoffe | comet_csr13_linkone | comet_csr13_wfre | comet_csr13_lsce | comet_csr13_mpre);
+                if (wolopts & WAKE_MAGIC)
+                        tmp |= comet_csr13_mpre;
+                if (wolopts & WAKE_PHY)
+                        tmp |= comet_csr13_linkoffe | comet_csr13_linkone | comet_csr13_lsce;
+                /* Clear the event flags */
+                tmp |= comet_csr13_wfr | comet_csr13_mpr | comet_csr13_lsc;
+                iowrite32(tmp, ioaddr + CSR13);
+        }
+}
+
 #ifdef CONFIG_PM
 
+
 static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)
 {
+        pci_power_t pstate;
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct tulip_private *tp = netdev_priv(dev);
 
         if (!dev)
                 return -EINVAL;
@@ -1779,7 +1863,16 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)
 save_state:
         pci_save_state(pdev);
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        pstate = pci_choose_state(pdev, state);
+        if (state.event == PM_EVENT_SUSPEND && pstate != PCI_D0) {
+                int rc;
+
+                tulip_set_wolopts(pdev, tp->wolinfo.wolopts);
+                rc = pci_enable_wake(pdev, pstate, tp->wolinfo.wolopts);
+                if (rc)
+                        printk("tulip: pci_enable_wake failed (%d)\n", rc);
+        }
+        pci_set_power_state(pdev, pstate);
 
         return 0;
 }
@@ -1788,7 +1881,10 @@ save_state:
 static int tulip_resume(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct tulip_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->base_addr;
         int retval;
+        unsigned int tmp;
 
         if (!dev)
                 return -EINVAL;
@@ -1809,6 +1905,18 @@ static int tulip_resume(struct pci_dev *pdev)
                 return retval;
         }
 
+        if (tp->flags & COMET_PM) {
+                pci_enable_wake(pdev, PCI_D3hot, 0);
+                pci_enable_wake(pdev, PCI_D3cold, 0);
+
+                /* Clear the PMES flag */
+                tmp = ioread32(ioaddr + CSR20);
+                tmp |= comet_csr20_pmes;
+                iowrite32(tmp, ioaddr + CSR20);
+
+                /* Disable all wake-up events */
+                tulip_set_wolopts(pdev, 0);
+        }
         netif_device_attach(dev);
 
         if (netif_running(dev))
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 97b25533e5f..6ad6fe70631 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -526,6 +526,8 @@ static inline struct sk_buff *tun_alloc_skb(struct tun_struct *tun,
         struct sk_buff *skb;
         int err;
 
+        sock_update_classid(sk);
+
         /* Under a page?  Don't bother with paged skb. */
         if (prepad + len < PAGE_SIZE || !linear)
                 linear = len;
@@ -1649,3 +1651,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_AUTHOR(DRV_COPYRIGHT);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(TUN_MINOR);
+MODULE_ALIAS("devname:net/tun");
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 22bde49262c..2e50077ff45 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -255,7 +255,7 @@ struct typhoon_shared {
         struct rx_free                  rxBuff[RXFREE_ENTRIES]  __3xp_aligned;
         u32                             zeroWord;
         struct tx_desc                  txHi[TXHI_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 struct rxbuff_ent {
         struct sk_buff *skb;
diff --git a/drivers/net/typhoon.h b/drivers/net/typhoon.h
index 673fd512591..88187fc84aa 100644
--- a/drivers/net/typhoon.h
+++ b/drivers/net/typhoon.h
@@ -77,7 +77,7 @@ struct typhoon_indexes {
         volatile __le32 cmdCleared;
         volatile __le32 respReady;
         volatile __le32 rxHiReady;
-} __attribute__ ((packed));
+} __packed;
 
 /* The host<->Typhoon interface
  * Our means of communicating where things are
@@ -125,7 +125,7 @@ struct typhoon_interface {
         __le32 rxHiAddr;
         __le32 rxHiAddrHi;
         __le32 rxHiSize;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon transmit/fragment descriptor
  *
@@ -187,7 +187,7 @@ struct tx_desc {
 #define TYPHOON_TX_PF_VLAN_MASK         cpu_to_le32(0x0ffff000)
 #define TYPHOON_TX_PF_INTERNAL          cpu_to_le32(0xf0000000)
 #define TYPHOON_TX_PF_VLAN_TAG_SHIFT    12
-} __attribute__ ((packed));
+} __packed;
 
 /* The TCP Segmentation offload option descriptor
  *
@@ -208,7 +208,7 @@ struct tcpopt_desc {
         __le32 respAddrLo;
         __le32 bytesTx;
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 /* The IPSEC Offload descriptor
  *
@@ -227,7 +227,7 @@ struct ipsec_desc {
         __le32 sa1;
         __le32 sa2;
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon receive descriptor (Updated by NIC)
  *
@@ -284,7 +284,7 @@ struct rx_desc {
 #define TYPHOON_RX_UNKNOWN_SA           cpu_to_le16(0x0100)
 #define TYPHOON_RX_ESP_FORMAT_ERR       cpu_to_le16(0x0200)
         __be32 vlanTag;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon free buffer descriptor, used to give a buffer to the NIC
  *
@@ -301,7 +301,7 @@ struct rx_free {
         __le32 physAddrHi;
         u32 virtAddr;
         u32 virtAddrHi;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon command descriptor, used for commands and responses
  *
@@ -347,7 +347,7 @@ struct cmd_desc {
         __le16 parm1;
         __le32 parm2;
         __le32 parm3;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon response descriptor, see command descriptor for details
  */
@@ -359,7 +359,7 @@ struct resp_desc {
         __le16 parm1;
         __le32 parm2;
         __le32 parm3;
-} __attribute__ ((packed));
+} __packed;
 
 #define INIT_COMMAND_NO_RESPONSE(x, command)                            \
         do { struct cmd_desc *_ptr = (x);                               \
@@ -427,7 +427,7 @@ struct stats_resp {
 #define TYPHOON_LINK_HALF_DUPLEX        cpu_to_le32(0x00000000)
         __le32 unused2;
         __le32 unused3;
-} __attribute__ ((packed));
+} __packed;
 
 /* TYPHOON_CMD_XCVR_SELECT xcvr values (resp.parm1)
  */
@@ -488,7 +488,7 @@ struct sa_descriptor {
         u32 index;
         u32 unused;
         u32 unused2;
-} __attribute__ ((packed));
+} __packed;
 
 /* TYPHOON_CMD_SET_OFFLOAD_TASKS bits (cmd.parm2 (Tx) & cmd.parm3 (Rx))
  * This is all for IPv4.
@@ -518,14 +518,14 @@ struct typhoon_file_header {
         __le32 numSections;
         __le32 startAddr;
         __le32 hmacDigest[5];
-} __attribute__ ((packed));
+} __packed;
 
 struct typhoon_section_header {
         __le32 len;
         u16 checksum;
         u16 reserved;
         __le32 startAddr;
-} __attribute__ ((packed));
+} __packed;
 
 /* The Typhoon Register offsets
  */
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 932602db54b..538148a3a14 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3702,6 +3702,19 @@ static phy_interface_t to_phy_interface(const char *phy_connection_type)
         return PHY_INTERFACE_MODE_MII;
 }
 
+static int ucc_geth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+
+        if (!netif_running(dev))
+                return -EINVAL;
+
+        if (!ugeth->phydev)
+                return -ENODEV;
+
+        return phy_mii_ioctl(ugeth->phydev, if_mii(rq), cmd);
+}
+
 static const struct net_device_ops ucc_geth_netdev_ops = {
         .ndo_open               = ucc_geth_open,
         .ndo_stop               = ucc_geth_close,
@@ -3711,6 +3724,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = {
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_set_multicast_list = ucc_geth_set_multi,
         .ndo_tx_timeout         = ucc_geth_timeout,
+        .ndo_do_ioctl           = ucc_geth_ioctl,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = ucc_netpoll,
 #endif
@@ -3719,7 +3733,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = {
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
         struct device *device = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct net_device *dev = NULL;
         struct ucc_geth_private *ugeth = NULL;
         struct ucc_geth_info *ug_info;
@@ -3963,8 +3977,11 @@ static struct of_device_id ucc_geth_match[] = {
 MODULE_DEVICE_TABLE(of, ucc_geth_match);
 
 static struct of_platform_driver ucc_geth_driver = {
-        .name           = DRV_NAME,
-        .match_table    = ucc_geth_match,
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = ucc_geth_match,
+        },
         .probe          = ucc_geth_probe,
         .remove         = ucc_geth_remove,
         .suspend        = ucc_geth_suspend,
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index ef1fbeb11c6..05a95586f3c 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -106,7 +106,7 @@ struct ucc_geth {
         u32 scar;               /* Statistics carry register */
         u32 scam;               /* Statistics caryy mask register */
         u8 res5[0x200 - 0x1c4];
-} __attribute__ ((packed));
+} __packed;
 
 /* UCC GETH TEMODR Register */
 #define TEMODER_TX_RMON_STATISTICS_ENABLE       0x0100  /* enable Tx statistics
@@ -420,11 +420,11 @@ struct ucc_geth {
 
 struct ucc_geth_thread_data_tx {
         u8 res0[104];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_thread_data_rx {
         u8 res0[40];
-} __attribute__ ((packed));
+} __packed;
 
 /* Send Queue Queue-Descriptor */
 struct ucc_geth_send_queue_qd {
@@ -432,19 +432,19 @@ struct ucc_geth_send_queue_qd {
         u8 res0[0x8];
         u32 last_bd_completed_address;/* initialize to last entry in BD ring */
         u8 res1[0x30];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_send_queue_mem_region {
         struct ucc_geth_send_queue_qd sqqd[NUM_TX_QUEUES];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_thread_tx_pram {
         u8 res0[64];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_thread_rx_pram {
         u8 res0[128];
-} __attribute__ ((packed));
+} __packed;
 
 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING        64
 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8      64
@@ -484,7 +484,7 @@ struct ucc_geth_scheduler {
                                       /**< weight factor for queues   */
         u32 minw;               /* temporary variable handled by QE */
         u8 res1[0x70 - 0x64];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_tx_firmware_statistics_pram {
         u32 sicoltx;            /* single collision */
@@ -506,7 +506,7 @@ struct ucc_geth_tx_firmware_statistics_pram {
                                    and 1518 octets */
         u32 txpktsjumbo;        /* total packets (including bad) between 1024
                                    and MAXLength octets */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_firmware_statistics_pram {
         u32 frrxfcser;          /* frames with crc error */
@@ -540,7 +540,7 @@ struct ucc_geth_rx_firmware_statistics_pram {
                                    replaced */
         u32 insertvlan;         /* total frames that had their VLAN tag
                                    inserted */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_interrupt_coalescing_entry {
         u32 interruptcoalescingmaxvalue;        /* interrupt coalescing max
@@ -548,23 +548,23 @@ struct ucc_geth_rx_interrupt_coalescing_entry {
         u32 interruptcoalescingcounter; /* interrupt coalescing counter,
                                            initialize to
                                            interruptcoalescingmaxvalue */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_interrupt_coalescing_table {
         struct ucc_geth_rx_interrupt_coalescing_entry coalescingentry[NUM_RX_QUEUES];
                                        /**< interrupt coalescing entry */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_prefetched_bds {
         struct qe_bd bd[NUM_BDS_IN_PREFETCHED_BDS];     /* prefetched bd */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_bd_queues_entry {
         u32 bdbaseptr;          /* BD base pointer */
         u32 bdptr;              /* BD pointer */
         u32 externalbdbaseptr;  /* external BD base pointer */
         u32 externalbdptr;      /* external BD pointer */
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_tx_global_pram {
         u16 temoder;
@@ -580,13 +580,13 @@ struct ucc_geth_tx_global_pram {
         u32 tqptr;              /* a base pointer to the Tx Queues Memory
                                    Region */
         u8 res2[0x80 - 0x74];
-} __attribute__ ((packed));
+} __packed;
 
 /* structure representing Extended Filtering Global Parameters in PRAM */
 struct ucc_geth_exf_global_pram {
         u32 l2pcdptr;           /* individual address filter, high */
         u8 res0[0x10 - 0x04];
-} __attribute__ ((packed));
+} __packed;
 
 struct ucc_geth_rx_global_pram {
         u32 remoder;            /* ethernet mode reg. */
@@ -620,7 +620,7 @@ struct ucc_geth_rx_global_pram {
         u32 exfGlobalParam;     /* base address for extended filtering global
                                    parameters */
         u8 res6[0x100 - 0xC4];  /* Initialize to zero */
-} __attribute__ ((packed));
+} __packed;
 
 #define GRACEFUL_STOP_ACKNOWLEDGE_RX            0x01
 
@@ -639,7 +639,7 @@ struct ucc_geth_init_pram {
         u32 txglobal;           /* tx global */
         u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX];   /* tx threads */
         u8 res3[0x1];
-} __attribute__ ((packed));
+} __packed;
 
 #define ENET_INIT_PARAM_RGF_SHIFT               (32 - 4)
 #define ENET_INIT_PARAM_TGF_SHIFT               (32 - 8)
@@ -661,7 +661,7 @@ struct ucc_geth_82xx_enet_address {
         u16 h;                  /* address (MSB) */
         u16 m;                  /* address */
         u16 l;                  /* address (LSB) */
-} __attribute__ ((packed));
+} __packed;
 
 /* structure representing 82xx Address Filtering PRAM */
 struct ucc_geth_82xx_address_filtering_pram {
@@ -672,7 +672,7 @@ struct ucc_geth_82xx_address_filtering_pram {
         struct ucc_geth_82xx_enet_address __iomem taddr;
         struct ucc_geth_82xx_enet_address __iomem paddr[NUM_OF_PADDRS];
         u8 res0[0x40 - 0x38];
-} __attribute__ ((packed));
+} __packed;
 
 /* GETH Tx firmware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
@@ -696,7 +696,7 @@ struct ucc_geth_tx_firmware_statistics {
                                    and 1518 octets */
         u32 txpktsjumbo;        /* total packets (including bad) between 1024
                                    and MAXLength octets */
-} __attribute__ ((packed));
+} __packed;
 
 /* GETH Rx firmware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
@@ -732,7 +732,7 @@ struct ucc_geth_rx_firmware_statistics {
                                    replaced */
         u32 insertvlan;         /* total frames that had their VLAN tag
                                    inserted */
-} __attribute__ ((packed));
+} __packed;
 
 /* GETH hardware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
@@ -781,7 +781,7 @@ struct ucc_geth_hardware_statistics {
         u32 rbca;               /* Total number of frames received successfully
                                    that had destination address equal to the
                                    broadcast address */
-} __attribute__ ((packed));
+} __packed;
 
 /* UCC GETH Tx errors returned via TxConf callback */
 #define TX_ERRORS_DEF      0x0200
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 31b73310ec7..aea4645be7f 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -179,7 +179,7 @@ struct ax88172_int_data {
         __le16 res2;
         u8 status;
         __le16 res3;
-} __attribute__ ((packed));
+} __packed;
 
 static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
                             u16 size, void *data)
@@ -322,7 +322,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                 size = (u16) (header & 0x0000ffff);
 
                 if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
-                        u8 alignment = (u32)skb->data & 0x3;
+                        u8 alignment = (unsigned long)skb->data & 0x3;
                         if (alignment != 0x2) {
                                 /*
                                  * not 16bit aligned so use the room provided by
@@ -344,14 +344,14 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                         return 2;
                 }
 
-                if (size > ETH_FRAME_LEN) {
+                if (size > dev->net->mtu + ETH_HLEN) {
                         netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
                                    size);
                         return 0;
                 }
                 ax_skb = skb_clone(skb, GFP_ATOMIC);
                 if (ax_skb) {
-                        u8 alignment = (u32)packet & 0x3;
+                        u8 alignment = (unsigned long)packet & 0x3;
                         ax_skb->len = size;
 
                         if (alignment != 0x2) {
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 9964df19951..c8570b09788 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -211,7 +211,7 @@ struct hso_serial_state_notification {
         u16 wIndex;
         u16 wLength;
         u16 UART_state_bitmap;
-} __attribute__((packed));
+} __packed;
 
 struct hso_tiocmget {
         struct mutex mutex;
@@ -475,6 +475,9 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0x8302)},
         {USB_DEVICE(0x0af0, 0x8304)},
         {USB_DEVICE(0x0af0, 0x8400)},
+        {USB_DEVICE(0x0af0, 0x8600)},
+        {USB_DEVICE(0x0af0, 0x8800)},
+        {USB_DEVICE(0x0af0, 0x8900)},
         {USB_DEVICE(0x0af0, 0xd035)},
         {USB_DEVICE(0x0af0, 0xd055)},
         {USB_DEVICE(0x0af0, 0xd155)},
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index d6078b8c427..2b7b39cad1c 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -207,7 +207,7 @@ struct kaweth_ethernet_configuration
         __le16 segment_size;
         __u16 max_multicast_filters;
         __u8 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 /****************************************************************
  *     kaweth_device
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index 961a8ed38d8..ba72a7281cb 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -64,13 +64,13 @@ struct nc_header {		// packed:
         // all else is optional, and must start with:
         // __le16       vendorId;       // from usb-if
         // __le16       productId;
-} __attribute__((__packed__));
+} __packed;
 
 #define PAD_BYTE        ((unsigned char)0xAC)
 
 struct nc_trailer {
         __le16  packet_id;
-} __attribute__((__packed__));
+} __packed;
 
 // packets may use FLAG_FRAMING_NC and optional pad
 #define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index f1942d69a0d..ee85c8b9a85 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -165,7 +165,7 @@ struct lsi_umts {
         u8 gw_addr_len; /* NW-supplied GW address len */
         u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */
         u8 reserved[8];
-} __attribute__ ((packed));
+} __packed;
 
 #define SIERRA_NET_LSI_COMMON_LEN      4
 #define SIERRA_NET_LSI_UMTS_LEN        (sizeof(struct lsi_umts))
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index a95c73de582..44115eea57f 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -643,7 +643,7 @@ int usbnet_stop (struct net_device *net)
         netif_stop_queue (net);
 
         netif_info(dev, ifdown, dev->net,
-                   "stop stats: rx/tx %ld/%ld, errs %ld/%ld\n",
+                   "stop stats: rx/tx %lu/%lu, errs %lu/%lu\n",
                    net->stats.rx_packets, net->stats.tx_packets,
                    net->stats.rx_errors, net->stats.tx_errors);
 
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index c38191179fa..f7b33ae7a70 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -193,7 +193,7 @@ struct rx_desc {
         __le32 pa_low;          /* Low 32 bit PCI address */
         __le16 pa_high;         /* Next 16 bit PCI address (48 total) */
         __le16 size;            /* bits 0--14 - frame size, bit 15 - enable int. */
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  *      Transmit descriptor
@@ -208,7 +208,7 @@ struct tdesc1 {
         __le16 vlan;
         u8 TCR;
         u8 cmd;                 /* bits 0--1 - TCPLS, bits 4--7 - CMDZ */
-} __attribute__ ((__packed__));
+} __packed;
 
 enum {
         TD_QUEUE = cpu_to_le16(0x8000)
@@ -218,7 +218,7 @@ struct td_buf {
         __le32 pa_low;
         __le16 pa_high;
         __le16 size;            /* bits 0--13 - size, bit 15 - queue */
-} __attribute__ ((__packed__));
+} __packed;
 
 struct tx_desc {
         struct tdesc0 tdesc0;
@@ -1096,7 +1096,7 @@ struct mac_regs {
 
         volatile __le16 PatternCRC[8];  /* 0xB0 */
         volatile __le32 ByteMask[4][4]; /* 0xC0 */
-} __attribute__ ((__packed__));
+} __packed;
 
 
 enum hw_mib {
@@ -1216,7 +1216,7 @@ struct arp_packet {
         u8 ar_sip[4];
         u8 ar_tha[ETH_ALEN];
         u8 ar_tip[4];
-} __attribute__ ((__packed__));
+} __packed;
 
 struct _magic_packet {
         u8 dest_mac[6];
@@ -1224,7 +1224,7 @@ struct _magic_packet {
         __be16 type;
         u8 MAC[16][6];
         u8 password[6];
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  *      Store for chip context when saving and restoring status. Not
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index b0a85d03879..1edb7a61983 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -122,7 +122,7 @@ static void skb_xmit_done(struct virtqueue *svq)
         struct virtnet_info *vi = svq->vdev->priv;
 
         /* Suppress further interrupts. */
-        svq->vq_ops->disable_cb(svq);
+        virtqueue_disable_cb(svq);
 
         /* We were probably waiting for more output buffers. */
         netif_wake_queue(vi->dev);
@@ -210,7 +210,7 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
                         return -EINVAL;
                 }
 
-                page = vi->rvq->vq_ops->get_buf(vi->rvq, &len);
+                page = virtqueue_get_buf(vi->rvq, &len);
                 if (!page) {
                         pr_debug("%s: rx error: %d buffers missing\n",
                                  skb->dev->name, hdr->mhdr.num_buffers);
@@ -340,7 +340,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)
 
         skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len);
 
-        err = vi->rvq->vq_ops->add_buf(vi->rvq, vi->rx_sg, 0, 2, skb);
+        err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);
         if (err < 0)
                 dev_kfree_skb(skb);
 
@@ -385,8 +385,8 @@ static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp)
 
         /* chain first in list head */
         first->private = (unsigned long)list;
-        err = vi->rvq->vq_ops->add_buf(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
-                                       first);
+        err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,
+                                    first, gfp);
         if (err < 0)
                 give_pages(vi, first);
 
@@ -404,7 +404,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp)
 
         sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE);
 
-        err = vi->rvq->vq_ops->add_buf(vi->rvq, vi->rx_sg, 0, 1, page);
+        err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 1, page, gfp);
         if (err < 0)
                 give_pages(vi, page);
 
@@ -433,7 +433,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
         } while (err > 0);
         if (unlikely(vi->num > vi->max))
                 vi->max = vi->num;
-        vi->rvq->vq_ops->kick(vi->rvq);
+        virtqueue_kick(vi->rvq);
         return !oom;
 }
 
@@ -442,7 +442,7 @@ static void skb_recv_done(struct virtqueue *rvq)
         struct virtnet_info *vi = rvq->vdev->priv;
         /* Schedule NAPI, Suppress further interrupts if successful. */
         if (napi_schedule_prep(&vi->napi)) {
-                rvq->vq_ops->disable_cb(rvq);
+                virtqueue_disable_cb(rvq);
                 __napi_schedule(&vi->napi);
         }
 }
@@ -471,7 +471,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
 
 again:
         while (received < budget &&
-               (buf = vi->rvq->vq_ops->get_buf(vi->rvq, &len)) != NULL) {
+               (buf = virtqueue_get_buf(vi->rvq, &len)) != NULL) {
                 receive_buf(vi->dev, buf, len);
                 --vi->num;
                 received++;
@@ -485,9 +485,9 @@ again:
         /* Out of packets? */
         if (received < budget) {
                 napi_complete(napi);
-                if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq)) &&
+                if (unlikely(!virtqueue_enable_cb(vi->rvq)) &&
                     napi_schedule_prep(napi)) {
-                        vi->rvq->vq_ops->disable_cb(vi->rvq);
+                        virtqueue_disable_cb(vi->rvq);
                         __napi_schedule(napi);
                         goto again;
                 }
@@ -501,7 +501,7 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
         struct sk_buff *skb;
         unsigned int len, tot_sgs = 0;
 
-        while ((skb = vi->svq->vq_ops->get_buf(vi->svq, &len)) != NULL) {
+        while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) {
                 pr_debug("Sent skb %p\n", skb);
                 vi->dev->stats.tx_bytes += skb->len;
                 vi->dev->stats.tx_packets++;
@@ -554,7 +554,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
                 sg_set_buf(vi->tx_sg, &hdr->hdr, sizeof hdr->hdr);
 
         hdr->num_sg = skb_to_sgvec(skb, vi->tx_sg + 1, 0, skb->len) + 1;
-        return vi->svq->vq_ops->add_buf(vi->svq, vi->tx_sg, hdr->num_sg,
+        return virtqueue_add_buf(vi->svq, vi->tx_sg, hdr->num_sg,
                                         0, skb);
 }
 
@@ -574,14 +574,14 @@ again:
         if (unlikely(capacity < 0)) {
                 netif_stop_queue(dev);
                 dev_warn(&dev->dev, "Unexpected full queue\n");
-                if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) {
-                        vi->svq->vq_ops->disable_cb(vi->svq);
+                if (unlikely(!virtqueue_enable_cb(vi->svq))) {
+                        virtqueue_disable_cb(vi->svq);
                         netif_start_queue(dev);
                         goto again;
                 }
                 return NETDEV_TX_BUSY;
         }
-        vi->svq->vq_ops->kick(vi->svq);
+        virtqueue_kick(vi->svq);
 
         /* Don't wait up for transmitted skbs to be freed. */
         skb_orphan(skb);
@@ -591,12 +591,12 @@ again:
          * before it gets out of hand.  Naturally, this wastes entries. */
         if (capacity < 2+MAX_SKB_FRAGS) {
                 netif_stop_queue(dev);
-                if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) {
+                if (unlikely(!virtqueue_enable_cb(vi->svq))) {
                         /* More just got used, free them then recheck. */
                         capacity += free_old_xmit_skbs(vi);
                         if (capacity >= 2+MAX_SKB_FRAGS) {
                                 netif_start_queue(dev);
-                                vi->svq->vq_ops->disable_cb(vi->svq);
+                                virtqueue_disable_cb(vi->svq);
                         }
                 }
         }
@@ -641,7 +641,7 @@ static int virtnet_open(struct net_device *dev)
          * now.  virtnet_poll wants re-enable the queue, so we disable here.
          * We synchronize against interrupts via NAPI_STATE_SCHED */
         if (napi_schedule_prep(&vi->napi)) {
-                vi->rvq->vq_ops->disable_cb(vi->rvq);
+                virtqueue_disable_cb(vi->rvq);
                 __napi_schedule(&vi->napi);
         }
         return 0;
@@ -678,15 +678,15 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
                 sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
         sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
 
-        BUG_ON(vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) < 0);
+        BUG_ON(virtqueue_add_buf(vi->cvq, sg, out, in, vi) < 0);
 
-        vi->cvq->vq_ops->kick(vi->cvq);
+        virtqueue_kick(vi->cvq);
 
         /*
          * Spin for a response, the kick causes an ioport write, trapping
          * into the hypervisor, so the request should be handled immediately.
          */
-        while (!vi->cvq->vq_ops->get_buf(vi->cvq, &tmp))
+        while (!virtqueue_get_buf(vi->cvq, &tmp))
                 cpu_relax();
 
         return status == VIRTIO_NET_OK;
@@ -1003,13 +1003,13 @@ static void free_unused_bufs(struct virtnet_info *vi)
 {
         void *buf;
         while (1) {
-                buf = vi->svq->vq_ops->detach_unused_buf(vi->svq);
+                buf = virtqueue_detach_unused_buf(vi->svq);
                 if (!buf)
                         break;
                 dev_kfree_skb(buf);
         }
         while (1) {
-                buf = vi->rvq->vq_ops->detach_unused_buf(vi->rvq);
+                buf = virtqueue_detach_unused_buf(vi->rvq);
                 if (!buf)
                         break;
                 if (vi->mergeable_rx_bufs || vi->big_packets)
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index b504bd56136..45c5dc22563 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -4012,7 +4012,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         int high_dma = 0;
         u64 vpath_mask = 0;
         struct vxgedev *vdev;
-        struct vxge_config ll_config;
+        struct vxge_config *ll_config = NULL;
         struct vxge_hw_device_config *device_config = NULL;
         struct vxge_hw_device_attr attr;
         int i, j, no_of_vpath = 0, max_vpath_supported = 0;
@@ -4071,17 +4071,24 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit0;
         }
 
-        memset(&ll_config, 0, sizeof(struct vxge_config));
-        ll_config.tx_steering_type = TX_MULTIQ_STEERING;
-        ll_config.intr_type = MSI_X;
-        ll_config.napi_weight = NEW_NAPI_WEIGHT;
-        ll_config.rth_steering = RTH_STEERING;
+        ll_config = kzalloc(sizeof(*ll_config), GFP_KERNEL);
+        if (!ll_config) {
+                ret = -ENOMEM;
+                vxge_debug_init(VXGE_ERR,
+                        "ll_config : malloc failed %s %d",
+                        __FILE__, __LINE__);
+                goto _exit0;
+        }
+        ll_config->tx_steering_type = TX_MULTIQ_STEERING;
+        ll_config->intr_type = MSI_X;
+        ll_config->napi_weight = NEW_NAPI_WEIGHT;
+        ll_config->rth_steering = RTH_STEERING;
 
         /* get the default configuration parameters */
         vxge_hw_device_config_default_get(device_config);
 
         /* initialize configuration parameters */
-        vxge_device_config_init(device_config, &ll_config.intr_type);
+        vxge_device_config_init(device_config, &ll_config->intr_type);
 
         ret = pci_enable_device(pdev);
         if (ret) {
@@ -4134,7 +4141,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 (unsigned long long)pci_resource_start(pdev, 0));
 
         status = vxge_hw_device_hw_info_get(attr.bar0,
-                        &ll_config.device_hw_info);
+                        &ll_config->device_hw_info);
         if (status != VXGE_HW_OK) {
                 vxge_debug_init(VXGE_ERR,
                         "%s: Reading of hardware info failed."
@@ -4143,7 +4150,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit3;
         }
 
-        if (ll_config.device_hw_info.fw_version.major !=
+        if (ll_config->device_hw_info.fw_version.major !=
                 VXGE_DRIVER_FW_VERSION_MAJOR) {
                 vxge_debug_init(VXGE_ERR,
                         "%s: Incorrect firmware version."
@@ -4153,7 +4160,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit3;
         }
 
-        vpath_mask = ll_config.device_hw_info.vpath_mask;
+        vpath_mask = ll_config->device_hw_info.vpath_mask;
         if (vpath_mask == 0) {
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: No vpaths available in device", VXGE_DRIVER_NAME);
@@ -4165,10 +4172,10 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 "%s:%d  Vpath mask = %llx", __func__, __LINE__,
                 (unsigned long long)vpath_mask);
 
-        function_mode = ll_config.device_hw_info.function_mode;
-        host_type = ll_config.device_hw_info.host_type;
+        function_mode = ll_config->device_hw_info.function_mode;
+        host_type = ll_config->device_hw_info.host_type;
         is_privileged = __vxge_hw_device_is_privilaged(host_type,
-                ll_config.device_hw_info.func_id);
+                ll_config->device_hw_info.func_id);
 
         /* Check how many vpaths are available */
         for (i = 0; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++) {
@@ -4182,7 +4189,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         /* Enable SRIOV mode, if firmware has SRIOV support and if it is a PF */
         if (is_sriov(function_mode) && (max_config_dev > 1) &&
-                (ll_config.intr_type != INTA) &&
+                (ll_config->intr_type != INTA) &&
                 (is_privileged == VXGE_HW_OK)) {
                 ret = pci_enable_sriov(pdev, ((max_config_dev - 1) < num_vfs)
                         ? (max_config_dev - 1) : num_vfs);
@@ -4195,7 +4202,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
          * Configure vpaths and get driver configured number of vpaths
          * which is less than or equal to the maximum vpaths per function.
          */
-        no_of_vpath = vxge_config_vpaths(device_config, vpath_mask, &ll_config);
+        no_of_vpath = vxge_config_vpaths(device_config, vpath_mask, ll_config);
         if (!no_of_vpath) {
                 vxge_debug_ll_config(VXGE_ERR,
                         "%s: No more vpaths to configure", VXGE_DRIVER_NAME);
@@ -4230,21 +4237,21 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         /* set private device info */
         pci_set_drvdata(pdev, hldev);
 
-        ll_config.gro_enable = VXGE_GRO_ALWAYS_AGGREGATE;
-        ll_config.fifo_indicate_max_pkts = VXGE_FIFO_INDICATE_MAX_PKTS;
-        ll_config.addr_learn_en = addr_learn_en;
-        ll_config.rth_algorithm = RTH_ALG_JENKINS;
-        ll_config.rth_hash_type_tcpipv4 = VXGE_HW_RING_HASH_TYPE_TCP_IPV4;
-        ll_config.rth_hash_type_ipv4 = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_tcpipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_ipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_tcpipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_hash_type_ipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
-        ll_config.rth_bkt_sz = RTH_BUCKET_SIZE;
-        ll_config.tx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
-        ll_config.rx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
-
-        if (vxge_device_register(hldev, &ll_config, high_dma, no_of_vpath,
+        ll_config->gro_enable = VXGE_GRO_ALWAYS_AGGREGATE;
+        ll_config->fifo_indicate_max_pkts = VXGE_FIFO_INDICATE_MAX_PKTS;
+        ll_config->addr_learn_en = addr_learn_en;
+        ll_config->rth_algorithm = RTH_ALG_JENKINS;
+        ll_config->rth_hash_type_tcpipv4 = VXGE_HW_RING_HASH_TYPE_TCP_IPV4;
+        ll_config->rth_hash_type_ipv4 = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_tcpipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_ipv6 = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_tcpipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_hash_type_ipv6ex = VXGE_HW_RING_HASH_TYPE_NONE;
+        ll_config->rth_bkt_sz = RTH_BUCKET_SIZE;
+        ll_config->tx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
+        ll_config->rx_pause_enable = VXGE_PAUSE_CTRL_ENABLE;
+
+        if (vxge_device_register(hldev, ll_config, high_dma, no_of_vpath,
                 &vdev)) {
                 ret = -EINVAL;
                 goto _exit4;
@@ -4275,7 +4282,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 vdev->vpaths[j].vdev = vdev;
                 vdev->vpaths[j].max_mac_addr_cnt = max_mac_vpath;
                 memcpy((u8 *)vdev->vpaths[j].macaddr,
-                                (u8 *)ll_config.device_hw_info.mac_addrs[i],
+                                ll_config->device_hw_info.mac_addrs[i],
                                 ETH_ALEN);
 
                 /* Initialize the mac address list header */
@@ -4296,18 +4303,18 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         macaddr = (u8 *)vdev->vpaths[0].macaddr;
 
-        ll_config.device_hw_info.serial_number[VXGE_HW_INFO_LEN - 1] = '\0';
-        ll_config.device_hw_info.product_desc[VXGE_HW_INFO_LEN - 1] = '\0';
-        ll_config.device_hw_info.part_number[VXGE_HW_INFO_LEN - 1] = '\0';
+        ll_config->device_hw_info.serial_number[VXGE_HW_INFO_LEN - 1] = '\0';
+        ll_config->device_hw_info.product_desc[VXGE_HW_INFO_LEN - 1] = '\0';
+        ll_config->device_hw_info.part_number[VXGE_HW_INFO_LEN - 1] = '\0';
 
         vxge_debug_init(VXGE_TRACE, "%s: SERIAL NUMBER: %s",
-                vdev->ndev->name, ll_config.device_hw_info.serial_number);
+                vdev->ndev->name, ll_config->device_hw_info.serial_number);
 
         vxge_debug_init(VXGE_TRACE, "%s: PART NUMBER: %s",
-                vdev->ndev->name, ll_config.device_hw_info.part_number);
+                vdev->ndev->name, ll_config->device_hw_info.part_number);
 
         vxge_debug_init(VXGE_TRACE, "%s: Neterion %s Server Adapter",
-                vdev->ndev->name, ll_config.device_hw_info.product_desc);
+                vdev->ndev->name, ll_config->device_hw_info.product_desc);
 
         vxge_debug_init(VXGE_TRACE, "%s: MAC ADDR: %pM",
                 vdev->ndev->name, macaddr);
@@ -4317,11 +4324,11 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 
         vxge_debug_init(VXGE_TRACE,
                 "%s: Firmware version : %s Date : %s", vdev->ndev->name,
-                ll_config.device_hw_info.fw_version.version,
-                ll_config.device_hw_info.fw_date.date);
+                ll_config->device_hw_info.fw_version.version,
+                ll_config->device_hw_info.fw_date.date);
 
         if (new_device) {
-                switch (ll_config.device_hw_info.function_mode) {
+                switch (ll_config->device_hw_info.function_mode) {
                 case VXGE_HW_FUNCTION_MODE_SINGLE_FUNCTION:
                         vxge_debug_init(VXGE_TRACE,
                         "%s: Single Function Mode Enabled", vdev->ndev->name);
@@ -4344,7 +4351,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         vxge_print_parm(vdev, vpath_mask);
 
         /* Store the fw version for ethttool option */
-        strcpy(vdev->fw_version, ll_config.device_hw_info.fw_version.version);
+        strcpy(vdev->fw_version, ll_config->device_hw_info.fw_version.version);
         memcpy(vdev->ndev->dev_addr, (u8 *)vdev->vpaths[0].macaddr, ETH_ALEN);
         memcpy(vdev->ndev->perm_addr, vdev->ndev->dev_addr, ETH_ALEN);
 
@@ -4383,7 +4390,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
          * present to prevent such a failure.
          */
 
-        if (ll_config.device_hw_info.function_mode ==
+        if (ll_config->device_hw_info.function_mode ==
                 VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION)
                 if (vdev->config.intr_type == INTA)
                         vxge_hw_device_unmask_all(hldev);
@@ -4395,6 +4402,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
         VXGE_COPY_DEBUG_INFO_TO_LL(vdev, vxge_hw_device_error_level_get(hldev),
                 vxge_hw_device_trace_level_get(hldev));
 
+        kfree(ll_config);
         return 0;
 
 _exit5:
@@ -4412,6 +4420,7 @@ _exit2:
 _exit1:
         pci_disable_device(pdev);
 _exit0:
+        kfree(ll_config);
         kfree(device_config);
         driver_config->config_dev_cnt--;
         pci_set_drvdata(pdev, NULL);
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index e087b9a6daa..43b77271532 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2038,16 +2038,10 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
                 /* Now copy the data to the card. */
 
-                buf = kmalloc(wrthdr.size, GFP_KERNEL);
-                if (!buf)
-                        return -ENOMEM;
-
-                if (copy_from_user(buf,
-                                   ifr->ifr_data + sizeof (struct fstioc_write),
-                                   wrthdr.size)) {
-                        kfree(buf);
-                        return -EFAULT;
-                }
+                buf = memdup_user(ifr->ifr_data + sizeof(struct fstioc_write),
+                                  wrthdr.size);
+                if (IS_ERR(buf))
+                        return PTR_ERR(buf);
 
                 memcpy_toio(card->mem + wrthdr.offset, buf, wrthdr.size);
                 kfree(buf);
diff --git a/drivers/net/wan/hd64570.h b/drivers/net/wan/hd64570.h
index 3839662ff20..e4f539ad071 100644
--- a/drivers/net/wan/hd64570.h
+++ b/drivers/net/wan/hd64570.h
@@ -153,7 +153,7 @@ typedef struct {
         u16 len;                /* Data Length */
         u8 stat;                /* Status */
         u8 unused;              /* pads to 2-byte boundary */
-}__attribute__ ((packed)) pkt_desc;
+}__packed pkt_desc;
 
 
 /* Packet Descriptor Status bits */
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index ee7083fbea5..b38ffa149ab 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -36,7 +36,7 @@ struct hdlc_header {
         u8 address;
         u8 control;
         __be16 protocol;
-}__attribute__ ((packed));
+}__packed;
 
 
 struct cisco_packet {
@@ -45,7 +45,7 @@ struct cisco_packet {
         __be32 par2;
         __be16 rel;             /* reliability */
         __be32 time;
-}__attribute__ ((packed));
+}__packed;
 #define CISCO_PACKET_LEN        18
 #define CISCO_BIG_PACKET_LEN    20
 
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 0e52993e207..0edb535bb2b 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -112,7 +112,7 @@ typedef struct {
         unsigned de:    1;
         unsigned ea2:   1;
 #endif
-}__attribute__ ((packed)) fr_hdr;
+}__packed fr_hdr;
 
 
 typedef struct pvc_device_struct {
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 43ae6f440bf..f4125da2762 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -330,7 +330,7 @@ struct _dlci_stat
 {
         short dlci;
         char  flags;
-} __attribute__((packed));
+} __packed;
 
 struct _frad_stat 
 {
@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
         }
         else
         {
-                temp = kmalloc(mem.len, GFP_KERNEL);
-                if (!temp)
-                        return(-ENOMEM);
-                if(copy_from_user(temp, mem.data, mem.len))
-                {
-                        kfree(temp);
-                        return -EFAULT;
-                }
+                temp = memdup_user(mem.data, mem.len);
+                if (IS_ERR(temp))
+                        return PTR_ERR(temp);
                 sdla_write(dev, mem.addr, temp, mem.len);
                 kfree(temp);
         }
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 166e77dfffd..e47f5a986b1 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -37,8 +37,6 @@
 #include <net/x25device.h>
 #include "x25_asy.h"
 
-#include <net/x25device.h>
-
 static struct net_device **x25_asy_devs;
 static int x25_asy_maxdev = SL_NRUNIT;
 
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index d86e8f31e7f..2f725d0cc76 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -848,7 +848,7 @@ struct i2400m_cmd_enter_power_save {
         struct i2400m_l3l4_hdr hdr;
         struct i2400m_tlv_hdr tlv;
         __le32 val;
-} __attribute__((packed));
+} __packed;
 
 
 /*
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 3f283bff0ff..8b55a5b1415 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -651,7 +651,7 @@ static int i2400m_download_chunk(struct i2400m *i2400m, const void *chunk,
         struct {
                 struct i2400m_bootrom_header cmd;
                 u8 cmd_payload[chunk_len];
-        } __attribute__((packed)) *buf;
+        } __packed *buf;
         struct i2400m_bootrom_header ack;
 
         d_fnstart(5, dev, "(i2400m %p chunk %p __chunk_len %zu addr 0x%08lx "
@@ -794,7 +794,7 @@ int i2400m_dnload_finalize(struct i2400m *i2400m,
         struct {
                 struct i2400m_bootrom_header cmd;
                 u8 cmd_pl[0];
-        } __attribute__((packed)) *cmd_buf;
+        } __packed *cmd_buf;
         size_t signature_block_offset, signature_block_size;
 
         d_fnstart(3, dev, "offset %zu\n", offset);
@@ -1029,7 +1029,7 @@ int i2400m_read_mac_addr(struct i2400m *i2400m)
         struct {
                 struct i2400m_bootrom_header ack;
                 u8 ack_pl[16];
-        } __attribute__((packed)) ack_buf;
+        } __packed ack_buf;
 
         d_fnstart(5, dev, "(i2400m %p)\n", i2400m);
         cmd = i2400m->bm_cmd_buf;
@@ -1115,7 +1115,7 @@ int i2400m_dnload_init_signed(struct i2400m *i2400m,
         struct {
                 struct i2400m_bootrom_header cmd;
                 struct i2400m_bcf_hdr cmd_pl;
-        } __attribute__((packed)) *cmd_buf;
+        } __packed *cmd_buf;
         struct i2400m_bootrom_header ack;
 
         d_fnstart(5, dev, "(i2400m %p bcf_hdr %p)\n", i2400m, bcf_hdr);
@@ -1192,7 +1192,7 @@ int i2400m_fw_hdr_check(struct i2400m *i2400m,
         unsigned module_type, header_len, major_version, minor_version,
                 module_id, module_vendor, date, size;
 
-        module_type = bcf_hdr->module_type;
+        module_type = le32_to_cpu(bcf_hdr->module_type);
         header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len);
         major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000)
                 >> 16;
diff --git a/drivers/net/wimax/i2400m/op-rfkill.c b/drivers/net/wimax/i2400m/op-rfkill.c
index 035e4cf3e6e..9e02b90b008 100644
--- a/drivers/net/wimax/i2400m/op-rfkill.c
+++ b/drivers/net/wimax/i2400m/op-rfkill.c
@@ -91,7 +91,7 @@ int i2400m_op_rfkill_sw_toggle(struct wimax_dev *wimax_dev,
         struct {
                 struct i2400m_l3l4_hdr hdr;
                 struct i2400m_tlv_rf_operation sw_rf;
-        } __attribute__((packed)) *cmd;
+        } __packed *cmd;
         char strerr[32];
 
         d_fnstart(4, dev, "(wimax_dev %p state %d)\n", wimax_dev, state);
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 6537593fae6..8cc9e319f43 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -1027,12 +1027,12 @@ void i2400m_rx_edata(struct i2400m *i2400m, struct sk_buff *skb_rx,
                 ro_sn = (reorder >> I2400M_RO_SN_SHIFT) & I2400M_RO_SN;
 
                 spin_lock_irqsave(&i2400m->rx_lock, flags);
-                roq = &i2400m->rx_roq[ro_cin];
-                if (roq == NULL) {
+                if (i2400m->rx_roq == NULL) {
                         kfree_skb(skb); /* rx_roq is already destroyed */
                         spin_unlock_irqrestore(&i2400m->rx_lock, flags);
                         goto error;
                 }
+                roq = &i2400m->rx_roq[ro_cin];
                 kref_get(&i2400m->rx_roq_refcount);
                 spin_unlock_irqrestore(&i2400m->rx_lock, flags);
 
diff --git a/drivers/net/wireless/adm8211.h b/drivers/net/wireless/adm8211.h
index b07e4d3a6b4..bbc10b1cde8 100644
--- a/drivers/net/wireless/adm8211.h
+++ b/drivers/net/wireless/adm8211.h
@@ -80,7 +80,7 @@ struct adm8211_csr {
         __le32 FEMR;            /* 0x104 */
         __le32 FPSR;            /* 0x108 */
         __le32 FFER;            /* 0x10C */
-} __attribute__ ((packed));
+} __packed;
 
 /* CSR0 - PAR (PCI Address Register) */
 #define ADM8211_PAR_MWIE        (1 << 24)
@@ -484,7 +484,7 @@ struct adm8211_tx_hdr {
         u8 entry_control;       // huh??
         u16 reserved_1;
         u32 reserved_2;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define RX_COPY_BREAK 128
@@ -531,7 +531,7 @@ struct adm8211_eeprom {
         u8      lnags_threshold[14];    /* 0x70 */
         __le16  checksum;               /* 0x7E */
         u8      cis_data[0];            /* 0x80, 384 bytes */
-} __attribute__ ((packed));
+} __packed;
 
 struct adm8211_priv {
         struct pci_dev *pdev;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index a441aad922c..6b605df8a92 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -506,20 +506,20 @@ struct WepKeyRid {
         u8 mac[ETH_ALEN];
         __le16 klen;
         u8 key[16];
-} __attribute__ ((packed));
+} __packed;
 
 /* These structures are from the Aironet's PC4500 Developers Manual */
 typedef struct Ssid Ssid;
 struct Ssid {
         __le16 len;
         u8 ssid[32];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct SsidRid SsidRid;
 struct SsidRid {
         __le16 len;
         Ssid ssids[3];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct ModulationRid ModulationRid;
 struct ModulationRid {
@@ -528,7 +528,7 @@ struct ModulationRid {
 #define MOD_DEFAULT cpu_to_le16(0)
 #define MOD_CCK cpu_to_le16(1)
 #define MOD_MOK cpu_to_le16(2)
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct ConfigRid ConfigRid;
 struct ConfigRid {
@@ -652,7 +652,7 @@ struct ConfigRid {
 #define MAGIC_STAY_IN_CAM (1<<10)
         u8 magicControl;
         __le16 autoWake;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct StatusRid StatusRid;
 struct StatusRid {
@@ -711,20 +711,20 @@ struct StatusRid {
 #define STAT_LEAPFAILED 91
 #define STAT_LEAPTIMEDOUT 92
 #define STAT_LEAPCOMPLETE 93
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct StatsRid StatsRid;
 struct StatsRid {
         __le16 len;
         __le16 spacer;
         __le32 vals[100];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct APListRid APListRid;
 struct APListRid {
         __le16 len;
         u8 ap[4][ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct CapabilityRid CapabilityRid;
 struct CapabilityRid {
@@ -754,7 +754,7 @@ struct CapabilityRid {
         __le16 bootBlockVer;
         __le16 requiredHard;
         __le16 extSoftCap;
-} __attribute__ ((packed));
+} __packed;
 
 /* Only present on firmware >= 5.30.17 */
 typedef struct BSSListRidExtra BSSListRidExtra;
@@ -762,7 +762,7 @@ struct BSSListRidExtra {
   __le16 unknown[4];
   u8 fixed[12]; /* WLAN management frame */
   u8 iep[624];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct BSSListRid BSSListRid;
 struct BSSListRid {
@@ -796,7 +796,7 @@ struct BSSListRid {
 
   /* Only present on firmware >= 5.30.17 */
   BSSListRidExtra extra;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
   BSSListRid bss;
@@ -807,13 +807,13 @@ typedef struct tdsRssiEntry tdsRssiEntry;
 struct tdsRssiEntry {
   u8 rssipct;
   u8 rssidBm;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct tdsRssiRid tdsRssiRid;
 struct tdsRssiRid {
   u16 len;
   tdsRssiEntry x[256];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct MICRid MICRid;
 struct MICRid {
@@ -823,7 +823,7 @@ struct MICRid {
         u8  multicast[16];
         __le16 unicastValid;
         u8  unicast[16];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct MICBuffer MICBuffer;
 struct MICBuffer {
@@ -841,7 +841,7 @@ struct MICBuffer {
         } u;
         __be32 mic;
         __be32 seq;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
         u8 da[ETH_ALEN];
@@ -996,7 +996,7 @@ struct rx_hdr {
         u8 rate;
         u8 freq;
         __le16 tmp[4];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
         unsigned int  ctl: 15;
@@ -5162,13 +5162,6 @@ static void proc_SSID_on_close(struct inode *inode, struct file *file)
         enable_MAC(ai, 1);
 }
 
-static inline u8 hexVal(char c) {
-        if (c>='0' && c<='9') return c -= '0';
-        if (c>='a' && c<='f') return c -= 'a'-10;
-        if (c>='A' && c<='F') return c -= 'A'-10;
-        return 0;
-}
-
 static void proc_APList_on_close( struct inode *inode, struct file *file ) {
         struct proc_data *data = (struct proc_data *)file->private_data;
         struct proc_dir_entry *dp = PDE(inode);
@@ -5188,11 +5181,11 @@ static void proc_APList_on_close( struct inode *inode, struct file *file ) {
                         switch(j%3) {
                         case 0:
                                 APList_rid.ap[i][j/3]=
-                                        hexVal(data->wbuffer[j+i*6*3])<<4;
+                                        hex_to_bin(data->wbuffer[j+i*6*3])<<4;
                                 break;
                         case 1:
                                 APList_rid.ap[i][j/3]|=
-                                        hexVal(data->wbuffer[j+i*6*3]);
+                                        hex_to_bin(data->wbuffer[j+i*6*3]);
                                 break;
                         }
                 }
@@ -5340,10 +5333,10 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {
         for( i = 0; i < 16*3 && data->wbuffer[i+j]; i++ ) {
                 switch(i%3) {
                 case 0:
-                        key[i/3] = hexVal(data->wbuffer[i+j])<<4;
+                        key[i/3] = hex_to_bin(data->wbuffer[i+j])<<4;
                         break;
                 case 1:
-                        key[i/3] |= hexVal(data->wbuffer[i+j]);
+                        key[i/3] |= hex_to_bin(data->wbuffer[i+j]);
                         break;
                 }
         }
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 8a2d4afc74f..429b281d40d 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -305,7 +305,7 @@ struct dfu_status {
         unsigned char poll_timeout[3];
         unsigned char state;
         unsigned char string;
-} __attribute__((packed));
+} __packed;
 
 static inline int at76_is_intersil(enum board_type board)
 {
diff --git a/drivers/net/wireless/at76c50x-usb.h b/drivers/net/wireless/at76c50x-usb.h
index 1ec5ccffdbc..972ea0fc1a0 100644
--- a/drivers/net/wireless/at76c50x-usb.h
+++ b/drivers/net/wireless/at76c50x-usb.h
@@ -99,7 +99,7 @@ struct hwcfg_r505 {
         u8 reserved2[14];
         u8 cr15_values[14];
         u8 reserved3[3];
-} __attribute__((packed));
+} __packed;
 
 struct hwcfg_rfmd {
         u8 cr20_values[14];
@@ -111,7 +111,7 @@ struct hwcfg_rfmd {
         u8 low_power_values[14];
         u8 normal_power_values[14];
         u8 reserved1[3];
-} __attribute__((packed));
+} __packed;
 
 struct hwcfg_intersil {
         u8 mac_addr[ETH_ALEN];
@@ -120,7 +120,7 @@ struct hwcfg_intersil {
         u8 pidvid[4];
         u8 regulatory_domain;
         u8 reserved[1];
-} __attribute__((packed));
+} __packed;
 
 union at76_hwcfg {
         struct hwcfg_intersil i;
@@ -149,14 +149,14 @@ struct at76_card_config {
         u8 ssid_len;
         u8 short_preamble;
         __le16 beacon_period;
-} __attribute__((packed));
+} __packed;
 
 struct at76_command {
         u8 cmd;
         u8 reserved;
         __le16 size;
         u8 data[0];
-} __attribute__((packed));
+} __packed;
 
 /* Length of Atmel-specific Rx header before 802.11 frame */
 #define AT76_RX_HDRLEN offsetof(struct at76_rx_buffer, packet)
@@ -171,7 +171,7 @@ struct at76_rx_buffer {
         u8 noise_level;
         __le32 rx_time;
         u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
-} __attribute__((packed));
+} __packed;
 
 /* Length of Atmel-specific Tx header before 802.11 frame */
 #define AT76_TX_HDRLEN offsetof(struct at76_tx_buffer, packet)
@@ -182,7 +182,7 @@ struct at76_tx_buffer {
         u8 padding;
         u8 reserved[4];
         u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
-} __attribute__((packed));
+} __packed;
 
 /* defines for scan_type below */
 #define SCAN_TYPE_ACTIVE        0
@@ -198,7 +198,7 @@ struct at76_req_scan {
         __le16 max_channel_time;
         u8 essid_size;
         u8 international_scan;
-} __attribute__((packed));
+} __packed;
 
 struct at76_req_ibss {
         u8 bssid[ETH_ALEN];
@@ -207,7 +207,7 @@ struct at76_req_ibss {
         u8 channel;
         u8 essid_size;
         u8 reserved[3];
-} __attribute__((packed));
+} __packed;
 
 struct at76_req_join {
         u8 bssid[ETH_ALEN];
@@ -217,7 +217,7 @@ struct at76_req_join {
         __le16 timeout;
         u8 essid_size;
         u8 reserved;
-} __attribute__((packed));
+} __packed;
 
 struct set_mib_buffer {
         u8 type;
@@ -229,7 +229,7 @@ struct set_mib_buffer {
                 __le16 word;
                 u8 addr[ETH_ALEN];
         } data;
-} __attribute__((packed));
+} __packed;
 
 struct mib_local {
         u16 reserved0;
@@ -241,14 +241,14 @@ struct mib_local {
         u16 reserved2;
         u8 preamble_type;
         u16 reserved3;
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac_addr {
         u8 mac_addr[ETH_ALEN];
         u8 res[2];              /* ??? */
         u8 group_addr[4][ETH_ALEN];
         u8 group_addr_status[4];
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac {
         __le32 max_tx_msdu_lifetime;
@@ -269,7 +269,7 @@ struct mib_mac {
         u8 desired_bssid[ETH_ALEN];
         u8 desired_bsstype;     /* ad-hoc or infrastructure */
         u8 reserved2;
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac_mgmt {
         __le16 beacon_period;
@@ -292,7 +292,7 @@ struct mib_mac_mgmt {
         u8 multi_domain_capability_enabled;
         u8 country_string[3];
         u8 reserved[3];
-} __attribute__((packed));
+} __packed;
 
 struct mib_mac_wep {
         u8 privacy_invoked;     /* 0 disable encr., 1 enable encr */
@@ -303,7 +303,7 @@ struct mib_mac_wep {
         __le32 wep_excluded_count;
         u8 wep_default_keyvalue[WEP_KEYS][WEP_LARGE_KEY_LEN];
         u8 encryption_level;    /* 1 for 40bit, 2 for 104bit encryption */
-} __attribute__((packed));
+} __packed;
 
 struct mib_phy {
         __le32 ed_threshold;
@@ -320,19 +320,19 @@ struct mib_phy {
         u8 current_cca_mode;
         u8 phy_type;
         u8 current_reg_domain;
-} __attribute__((packed));
+} __packed;
 
 struct mib_fw_version {
         u8 major;
         u8 minor;
         u8 patch;
         u8 build;
-} __attribute__((packed));
+} __packed;
 
 struct mib_mdomain {
         u8 tx_powerlevel[14];
         u8 channel_list[14];    /* 0 for invalid channels */
-} __attribute__((packed));
+} __packed;
 
 struct at76_fw_header {
         __le32 crc;             /* CRC32 of the whole image */
@@ -346,7 +346,7 @@ struct at76_fw_header {
         __le32 int_fw_len;      /* internal firmware image length */
         __le32 ext_fw_offset;   /* external firmware image offset */
         __le32 ext_fw_len;      /* external firmware image length */
-} __attribute__((packed));
+} __packed;
 
 /* a description of a regulatory domain and the allowed channels */
 struct reg_domain {
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 3a003e6803a..8674a99356a 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -530,7 +530,7 @@ struct b43_fw_header {
         /* Size of the data. For ucode and PCM this is in bytes.
          * For IV this is number-of-ivs. */
         __be32 size;
-} __attribute__((__packed__));
+} __packed;
 
 /* Initial Value file format */
 #define B43_IV_OFFSET_MASK      0x7FFF
@@ -540,8 +540,8 @@ struct b43_iv {
         union {
                 __be16 d16;
                 __be32 d32;
-        } data __attribute__((__packed__));
-} __attribute__((__packed__));
+        } data __packed;
+} __packed;
 
 
 /* Data structures for DMA transmission, per 80211 core. */
diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h
index dc91944d602..a01c2100f16 100644
--- a/drivers/net/wireless/b43/dma.h
+++ b/drivers/net/wireless/b43/dma.h
@@ -67,7 +67,7 @@
 struct b43_dmadesc32 {
         __le32 control;
         __le32 address;
-} __attribute__ ((__packed__));
+} __packed;
 #define B43_DMA32_DCTL_BYTECNT          0x00001FFF
 #define B43_DMA32_DCTL_ADDREXT_MASK             0x00030000
 #define B43_DMA32_DCTL_ADDREXT_SHIFT    16
@@ -140,7 +140,7 @@ struct b43_dmadesc64 {
         __le32 control1;
         __le32 address_low;
         __le32 address_high;
-} __attribute__ ((__packed__));
+} __packed;
 #define B43_DMA64_DCTL0_DTABLEEND               0x10000000
 #define B43_DMA64_DCTL0_IRQ                     0x20000000
 #define B43_DMA64_DCTL0_FRAMEEND                0x40000000
@@ -153,8 +153,8 @@ struct b43_dmadesc_generic {
         union {
                 struct b43_dmadesc32 dma32;
                 struct b43_dmadesc64 dma64;
-        } __attribute__ ((__packed__));
-} __attribute__ ((__packed__));
+        } __packed;
+} __packed;
 
 /* Misc DMA constants */
 #define B43_DMA_RINGMEMSIZE             PAGE_SIZE
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h
index d23ff9fe0c9..d4cf9b390af 100644
--- a/drivers/net/wireless/b43/xmit.h
+++ b/drivers/net/wireless/b43/xmit.h
@@ -10,8 +10,8 @@
                 union {                         \
                         __le32 data;            \
                         __u8 raw[size];         \
-                } __attribute__((__packed__));  \
-        } __attribute__((__packed__))
+                } __packed;     \
+        } __packed
 
 /* struct b43_plcp_hdr4 */
 _b43_declare_plcp_hdr(4);
@@ -57,7 +57,7 @@ struct b43_txhdr {
                         __u8 rts_frame[16];             /* The RTS frame (if used) */
                         PAD_BYTES(2);
                         struct b43_plcp_hdr6 plcp;      /* Main PLCP header */
-                } new_format __attribute__ ((__packed__));
+                } new_format __packed;
 
                 /* The old r351 format. */
                 struct {
@@ -68,10 +68,10 @@ struct b43_txhdr {
                         __u8 rts_frame[16];             /* The RTS frame (if used) */
                         PAD_BYTES(2);
                         struct b43_plcp_hdr6 plcp;      /* Main PLCP header */
-                } old_format __attribute__ ((__packed__));
+                } old_format __packed;
 
-        } __attribute__ ((__packed__));
-} __attribute__ ((__packed__));
+        } __packed;
+} __packed;
 
 /* MAC TX control */
 #define B43_TXH_MAC_USEFBR              0x10000000 /* Use fallback rate for this AMPDU */
@@ -218,20 +218,20 @@ struct b43_rxhdr_fw4 {
                 struct {
                         __u8 jssi;      /* PHY RX Status 1: JSSI */
                         __u8 sig_qual;  /* PHY RX Status 1: Signal Quality */
-                } __attribute__ ((__packed__));
+                } __packed;
 
                 /* RSSI for N-PHYs */
                 struct {
                         __s8 power0;    /* PHY RX Status 1: Power 0 */
                         __s8 power1;    /* PHY RX Status 1: Power 1 */
-                } __attribute__ ((__packed__));
-        } __attribute__ ((__packed__));
+                } __packed;
+        } __packed;
         __le16 phy_status2;     /* PHY RX Status 2 */
         __le16 phy_status3;     /* PHY RX Status 3 */
         __le32 mac_status;      /* MAC RX status */
         __le16 mac_time;
         __le16 channel;
-} __attribute__ ((__packed__));
+} __packed;
 
 /* PHY RX Status 0 */
 #define B43_RX_PHYST0_GAINCTL           0x4000 /* Gain Control */
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index 89fe2f972c7..c81b2f53b0c 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -372,7 +372,7 @@ struct b43legacy_fw_header {
         /* Size of the data. For ucode and PCM this is in bytes.
          * For IV this is number-of-ivs. */
         __be32 size;
-} __attribute__((__packed__));
+} __packed;
 
 /* Initial Value file format */
 #define B43legacy_IV_OFFSET_MASK        0x7FFF
@@ -382,8 +382,8 @@ struct b43legacy_iv {
         union {
                 __be16 d16;
                 __be32 d32;
-        } data __attribute__((__packed__));
-} __attribute__((__packed__));
+        } data __packed;
+} __packed;
 
 #define B43legacy_PHYMODE(phytype)      (1 << (phytype))
 #define B43legacy_PHYMODE_B             B43legacy_PHYMODE       \
diff --git a/drivers/net/wireless/b43legacy/dma.h b/drivers/net/wireless/b43legacy/dma.h
index f9681041c2d..f89c3422628 100644
--- a/drivers/net/wireless/b43legacy/dma.h
+++ b/drivers/net/wireless/b43legacy/dma.h
@@ -72,7 +72,7 @@
 struct b43legacy_dmadesc32 {
         __le32 control;
         __le32 address;
-} __attribute__((__packed__));
+} __packed;
 #define B43legacy_DMA32_DCTL_BYTECNT            0x00001FFF
 #define B43legacy_DMA32_DCTL_ADDREXT_MASK       0x00030000
 #define B43legacy_DMA32_DCTL_ADDREXT_SHIFT      16
@@ -147,7 +147,7 @@ struct b43legacy_dmadesc64 {
         __le32 control1;
         __le32 address_low;
         __le32 address_high;
-} __attribute__((__packed__));
+} __packed;
 #define B43legacy_DMA64_DCTL0_DTABLEEND         0x10000000
 #define B43legacy_DMA64_DCTL0_IRQ               0x20000000
 #define B43legacy_DMA64_DCTL0_FRAMEEND          0x40000000
@@ -162,8 +162,8 @@ struct b43legacy_dmadesc_generic {
         union {
                 struct b43legacy_dmadesc32 dma32;
                 struct b43legacy_dmadesc64 dma64;
-        } __attribute__((__packed__));
-} __attribute__((__packed__));
+        } __packed;
+} __packed;
 
 
 /* Misc DMA constants */
diff --git a/drivers/net/wireless/b43legacy/xmit.h b/drivers/net/wireless/b43legacy/xmit.h
index 91633087a20..289db00a4a7 100644
--- a/drivers/net/wireless/b43legacy/xmit.h
+++ b/drivers/net/wireless/b43legacy/xmit.h
@@ -9,8 +9,8 @@
                 union {                         \
                         __le32 data;            \
                         __u8 raw[size];         \
-                } __attribute__((__packed__));  \
-        } __attribute__((__packed__))
+                } __packed;     \
+        } __packed
 
 /* struct b43legacy_plcp_hdr4 */
 _b43legacy_declare_plcp_hdr(4);
@@ -39,7 +39,7 @@ struct b43legacy_txhdr_fw3 {
         struct b43legacy_plcp_hdr6 rts_plcp;    /* RTS PLCP */
         __u8 rts_frame[18];                     /* The RTS frame (if used) */
         struct b43legacy_plcp_hdr6 plcp;
-} __attribute__((__packed__));
+} __packed;
 
 /* MAC TX control */
 #define B43legacy_TX4_MAC_KEYIDX        0x0FF00000 /* Security key index */
@@ -123,7 +123,7 @@ struct b43legacy_hwtxstatus {
         __le16 seq;
         u8 phy_stat;
         PAD_BYTES(1);
-} __attribute__((__packed__));
+} __packed;
 
 
 /* Receive header for v3 firmware. */
@@ -138,7 +138,7 @@ struct b43legacy_rxhdr_fw3 {
         __le16 mac_status;      /* MAC RX status */
         __le16 mac_time;
         __le16 channel;
-} __attribute__((__packed__));
+} __packed;
 
 
 /* PHY RX Status 0 */
diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h
index 7f9d8d976aa..ed98ce7c8f6 100644
--- a/drivers/net/wireless/hostap/hostap_80211.h
+++ b/drivers/net/wireless/hostap/hostap_80211.h
@@ -19,35 +19,35 @@ struct hostap_ieee80211_mgmt {
                         __le16 status_code;
                         /* possibly followed by Challenge text */
                         u8 variable[0];
-                } __attribute__ ((packed)) auth;
+                } __packed auth;
                 struct {
                         __le16 reason_code;
-                } __attribute__ ((packed)) deauth;
+                } __packed deauth;
                 struct {
                         __le16 capab_info;
                         __le16 listen_interval;
                         /* followed by SSID and Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) assoc_req;
+                } __packed assoc_req;
                 struct {
                         __le16 capab_info;
                         __le16 status_code;
                         __le16 aid;
                         /* followed by Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) assoc_resp, reassoc_resp;
+                } __packed assoc_resp, reassoc_resp;
                 struct {
                         __le16 capab_info;
                         __le16 listen_interval;
                         u8 current_ap[6];
                         /* followed by SSID and Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) reassoc_req;
+                } __packed reassoc_req;
                 struct {
                         __le16 reason_code;
-                } __attribute__ ((packed)) disassoc;
+                } __packed disassoc;
                 struct {
-                } __attribute__ ((packed)) probe_req;
+                } __packed probe_req;
                 struct {
                         u8 timestamp[8];
                         __le16 beacon_int;
@@ -55,9 +55,9 @@ struct hostap_ieee80211_mgmt {
                         /* followed by some of SSID, Supported rates,
                          * FH Params, DS Params, CF Params, IBSS Params, TIM */
                         u8 variable[0];
-                } __attribute__ ((packed)) beacon, probe_resp;
+                } __packed beacon, probe_resp;
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define IEEE80211_MGMT_HDR_LEN 24
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index 90b64b09200..4230102ac9e 100644
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -179,7 +179,7 @@ struct hfa384x_comp_ident
         __le16 variant;
         __le16 major;
         __le16 minor;
-} __attribute__ ((packed));
+} __packed;
 
 #define HFA384X_COMP_ID_PRI 0x15
 #define HFA384X_COMP_ID_STA 0x1f
@@ -192,14 +192,14 @@ struct hfa384x_sup_range
         __le16 variant;
         __le16 bottom;
         __le16 top;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct hfa384x_build_id
 {
         __le16 pri_seq;
         __le16 sec_seq;
-} __attribute__ ((packed));
+} __packed;
 
 /* FD01 - Download Buffer */
 struct hfa384x_rid_download_buffer
@@ -207,14 +207,14 @@ struct hfa384x_rid_download_buffer
         __le16 page;
         __le16 offset;
         __le16 length;
-} __attribute__ ((packed));
+} __packed;
 
 /* BSS connection quality (RID FD43 range, RID FD51 dBm-normalized) */
 struct hfa384x_comms_quality {
         __le16 comm_qual; /* 0 .. 92 */
         __le16 signal_level; /* 27 .. 154 */
         __le16 noise_level; /* 27 .. 154 */
-} __attribute__ ((packed));
+} __packed;
 
 
 /* netdevice private ioctls (used, e.g., with iwpriv from user space) */
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 1ba33be98b2..1c66b3c1030 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -31,14 +31,14 @@ struct linux_wlan_ng_val {
         u32 did;
         u16 status, len;
         u32 data;
-} __attribute__ ((packed));
+} __packed;
 
 struct linux_wlan_ng_prism_hdr {
         u32 msgcode, msglen;
         char devname[16];
         struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
                 noise, rate, istx, frmlen;
-} __attribute__ ((packed));
+} __packed;
 
 struct linux_wlan_ng_cap_hdr {
         __be32 version;
@@ -55,7 +55,7 @@ struct linux_wlan_ng_cap_hdr {
         __be32 ssi_noise;
         __be32 preamble;
         __be32 encoding;
-} __attribute__ ((packed));
+} __packed;
 
 struct hostap_radiotap_rx {
         struct ieee80211_radiotap_header hdr;
@@ -66,7 +66,7 @@ struct hostap_radiotap_rx {
         __le16 chan_flags;
         s8 dbm_antsignal;
         s8 dbm_antnoise;
-} __attribute__ ((packed));
+} __packed;
 
 #define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
 #define LWNG_CAPHDR_VERSION 0x80211001
@@ -97,7 +97,7 @@ struct hfa384x_rx_frame {
         __be16 len;
 
         /* followed by frame data; max 2304 bytes */
-} __attribute__ ((packed));
+} __packed;
 
 
 struct hfa384x_tx_frame {
@@ -126,14 +126,14 @@ struct hfa384x_tx_frame {
         __be16 len;
 
         /* followed by frame data; max 2304 bytes */
-} __attribute__ ((packed));
+} __packed;
 
 
 struct hfa384x_rid_hdr
 {
         __le16 len;
         __le16 rid;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* Macro for converting signal levels (range 27 .. 154) to wireless ext
@@ -145,24 +145,24 @@ struct hfa384x_rid_hdr
 struct hfa384x_scan_request {
         __le16 channel_list;
         __le16 txrate; /* HFA384X_RATES_* */
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_hostscan_request {
         __le16 channel_list;
         __le16 txrate;
         __le16 target_ssid_len;
         u8 target_ssid[32];
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_join_request {
         u8 bssid[6];
         __le16 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_info_frame {
         __le16 len;
         __le16 type;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_comm_tallies {
         __le16 tx_unicast_frames;
@@ -186,7 +186,7 @@ struct hfa384x_comm_tallies {
         __le16 rx_discards_wep_undecryptable;
         __le16 rx_message_in_msg_fragments;
         __le16 rx_message_in_bad_msg_fragments;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_comm_tallies32 {
         __le32 tx_unicast_frames;
@@ -210,7 +210,7 @@ struct hfa384x_comm_tallies32 {
         __le32 rx_discards_wep_undecryptable;
         __le32 rx_message_in_msg_fragments;
         __le32 rx_message_in_bad_msg_fragments;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_scan_result_hdr {
         __le16 reserved;
@@ -219,7 +219,7 @@ struct hfa384x_scan_result_hdr {
 #define HFA384X_SCAN_HOST_INITIATED 1
 #define HFA384X_SCAN_FIRMWARE_INITIATED 2
 #define HFA384X_SCAN_INQUIRY_FROM_HOST 3
-} __attribute__ ((packed));
+} __packed;
 
 #define HFA384X_SCAN_MAX_RESULTS 32
 
@@ -234,7 +234,7 @@ struct hfa384x_scan_result {
         u8 ssid[32];
         u8 sup_rates[10];
         __le16 rate;
-} __attribute__ ((packed));
+} __packed;
 
 struct hfa384x_hostscan_result {
         __le16 chid;
@@ -248,7 +248,7 @@ struct hfa384x_hostscan_result {
         u8 sup_rates[10];
         __le16 rate;
         __le16 atim;
-} __attribute__ ((packed));
+} __packed;
 
 struct comm_tallies_sums {
         unsigned int tx_unicast_frames;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 18ebd602670..56350d57196 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -5229,7 +5229,7 @@ struct security_info_params {
         u8 auth_mode;
         u8 replay_counters_number;
         u8 unicast_using_group;
-} __attribute__ ((packed));
+} __packed;
 
 static int ipw2100_set_security_information(struct ipw2100_priv *priv,
                                             int auth_mode,
@@ -8471,7 +8471,7 @@ struct ipw2100_fw_header {
         short mode;
         unsigned int fw_size;
         unsigned int uc_size;
-} __attribute__ ((packed));
+} __packed;
 
 static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
 {
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index 1eab0d698f4..838002b4881 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -164,7 +164,7 @@ struct bd_status {
                 } fields;
                 u8 field;
         } info;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw2100_bd {
         u32 host_addr;
@@ -174,7 +174,7 @@ struct ipw2100_bd {
          * 1st TBD) */
         u8 num_fragments;
         u8 reserved[6];
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_BD_QUEUE_LENGTH(n) (1<<n)
 #define IPW_BD_ALIGNMENT(L)    (L*sizeof(struct ipw2100_bd))
@@ -232,7 +232,7 @@ struct ipw2100_status {
 #define IPW_STATUS_FLAG_WEP_ENCRYPTED   (1<<1)
 #define IPW_STATUS_FLAG_CRC_ERROR       (1<<2)
         u8 rssi;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw2100_status_queue {
         /* driver (virtual) pointer to queue */
@@ -293,7 +293,7 @@ struct ipw2100_cmd_header {
         u32 reserved1[3];
         u32 *ordinal1_ptr;
         u32 *ordinal2_ptr;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw2100_data_header {
         u32 host_command_reg;
@@ -307,7 +307,7 @@ struct ipw2100_data_header {
         u8 src_addr[ETH_ALEN];
         u8 dst_addr[ETH_ALEN];
         u16 fragment_size;
-} __attribute__ ((packed));
+} __packed;
 
 /* Host command data structure */
 struct host_command {
@@ -316,7 +316,7 @@ struct host_command {
         u32 host_command_sequence;      // UNIQUE COMMAND NUMBER (ID)
         u32 host_command_length;        // LENGTH
         u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN];       // COMMAND PARAMETERS
-} __attribute__ ((packed));
+} __packed;
 
 typedef enum {
         POWER_ON_RESET,
@@ -382,7 +382,7 @@ struct ipw2100_notification {
         u32 hnhdr_size;         /* size in bytes of data
                                    or number of entries, if table.
                                    Does NOT include header */
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_KEY_SIZE    16
 #define MAX_KEYS        8
@@ -814,7 +814,7 @@ struct ipw2100_rx {
                 struct ipw2100_notification notification;
                 struct ipw2100_cmd_header command;
         } rx_data;
-} __attribute__ ((packed));
+} __packed;
 
 /* Bit 0-7 are for 802.11b tx rates - .  Bit 5-7 are reserved */
 #define TX_RATE_1_MBIT              0x0001
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/ipw2x00/ipw2200.h
index bf0eeb2e873..d7d049c7a4f 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.h
+++ b/drivers/net/wireless/ipw2x00/ipw2200.h
@@ -388,7 +388,7 @@ struct clx2_queue {
         dma_addr_t dma_addr;            /**< physical addr for BD's */
         int low_mark;                  /**< low watermark, resume queue if free space more than this */
         int high_mark;                 /**< high watermark, stop queue if free space less than this */
-} __attribute__ ((packed)); /* XXX */
+} __packed; /* XXX */
 
 struct machdr32 {
         __le16 frame_ctl;
@@ -399,7 +399,7 @@ struct machdr32 {
         __le16 seq_ctrl;                // more endians!
         u8 addr4[MACADRR_BYTE_LEN];
         __le16 qos_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 struct machdr30 {
         __le16 frame_ctl;
@@ -409,7 +409,7 @@ struct machdr30 {
         u8 addr3[MACADRR_BYTE_LEN];
         __le16 seq_ctrl;                // more endians!
         u8 addr4[MACADRR_BYTE_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct machdr26 {
         __le16 frame_ctl;
@@ -419,7 +419,7 @@ struct machdr26 {
         u8 addr3[MACADRR_BYTE_LEN];
         __le16 seq_ctrl;                // more endians!
         __le16 qos_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 struct machdr24 {
         __le16 frame_ctl;
@@ -428,20 +428,20 @@ struct machdr24 {
         u8 addr2[MACADRR_BYTE_LEN];
         u8 addr3[MACADRR_BYTE_LEN];
         __le16 seq_ctrl;                // more endians!
-} __attribute__ ((packed));
+} __packed;
 
 // TX TFD with 32 byte MAC Header
 struct tx_tfd_32 {
         struct machdr32 mchdr;  // 32
         __le32 uivplaceholder[2];       // 8
-} __attribute__ ((packed));
+} __packed;
 
 // TX TFD with 30 byte MAC Header
 struct tx_tfd_30 {
         struct machdr30 mchdr;  // 30
         u8 reserved[2];         // 2
         __le32 uivplaceholder[2];       // 8
-} __attribute__ ((packed));
+} __packed;
 
 // tx tfd with 26 byte mac header
 struct tx_tfd_26 {
@@ -449,14 +449,14 @@ struct tx_tfd_26 {
         u8 reserved1[2];        // 2
         __le32 uivplaceholder[2];       // 8
         u8 reserved2[4];        // 4
-} __attribute__ ((packed));
+} __packed;
 
 // tx tfd with 24 byte mac header
 struct tx_tfd_24 {
         struct machdr24 mchdr;  // 24
         __le32 uivplaceholder[2];       // 8
         u8 reserved[8];         // 8
-} __attribute__ ((packed));
+} __packed;
 
 #define DCT_WEP_KEY_FIELD_LENGTH 16
 
@@ -465,7 +465,7 @@ struct tfd_command {
         u8 length;
         __le16 reserved;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct tfd_data {
         /* Header */
@@ -504,14 +504,14 @@ struct tfd_data {
         __le32 num_chunks;
         __le32 chunk_ptr[NUM_TFD_CHUNKS];
         __le16 chunk_len[NUM_TFD_CHUNKS];
-} __attribute__ ((packed));
+} __packed;
 
 struct txrx_control_flags {
         u8 message_type;
         u8 rx_seq_num;
         u8 control_bits;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define  TFD_SIZE                           128
 #define  TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH   (TFD_SIZE - sizeof(struct txrx_control_flags))
@@ -523,7 +523,7 @@ struct tfd_frame {
                 struct tfd_command cmd;
                 u8 raw[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 typedef void destructor_func(const void *);
 
@@ -559,7 +559,7 @@ struct rate_histogram {
                 __le32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
                 __le32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
         } failed;
-} __attribute__ ((packed));
+} __packed;
 
 /* statistics command response */
 struct ipw_cmd_stats {
@@ -586,13 +586,13 @@ struct ipw_cmd_stats {
         __le16 rx_autodetec_no_ofdm;
         __le16 rx_autodetec_no_barker;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_channel_result {
         u8 channel_num;
         struct ipw_cmd_stats stats;
         u8 uReserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define SCAN_COMPLETED_STATUS_COMPLETE  1
 #define SCAN_COMPLETED_STATUS_ABORTED   2
@@ -602,24 +602,24 @@ struct notif_scan_complete {
         u8 num_channels;
         u8 status;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_frag_length {
         __le16 frag_length;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_beacon_state {
         __le32 state;
         __le32 number;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_tgi_tx_key {
         u8 key_state;
         u8 security_type;
         u8 station_index;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define SILENCE_OVER_THRESH (1)
 #define SILENCE_UNDER_THRESH (2)
@@ -631,25 +631,25 @@ struct notif_link_deterioration {
         struct rate_histogram histogram;
         u8 silence_notification_type;   /* SILENCE_OVER/UNDER_THRESH */
         __le16 silence_count;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_association {
         u8 state;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_authenticate {
         u8 state;
         struct machdr24 addr;
         __le16 status;
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_calibration {
         u8 data[104];
-} __attribute__ ((packed));
+} __packed;
 
 struct notif_noise {
         __le32 value;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_notification {
         u8 reserved[8];
@@ -669,7 +669,7 @@ struct ipw_rx_notification {
                 struct notif_noise noise;
                 u8 raw[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_frame {
         __le32 reserved1;
@@ -692,14 +692,14 @@ struct ipw_rx_frame {
         u8 rtscts_seen;         // 0x1 RTS seen ; 0x2 CTS seen
         __le16 length;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_header {
         u8 message_type;
         u8 rx_seq_num;
         u8 control_bits;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_packet {
         struct ipw_rx_header header;
@@ -707,7 +707,7 @@ struct ipw_rx_packet {
                 struct ipw_rx_frame frame;
                 struct ipw_rx_notification notification;
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_RX_NOTIFICATION_SIZE sizeof(struct ipw_rx_header) + 12
 #define IPW_RX_FRAME_SIZE        (unsigned int)(sizeof(struct ipw_rx_header) + \
@@ -717,7 +717,7 @@ struct ipw_rx_mem_buffer {
         dma_addr_t dma_addr;
         struct sk_buff *skb;
         struct list_head list;
-};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
+};                              /* Not transferred over network, so not  __packed */
 
 struct ipw_rx_queue {
         struct ipw_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
@@ -730,7 +730,7 @@ struct ipw_rx_queue {
         struct list_head rx_free;       /* Own an SKBs */
         struct list_head rx_used;       /* No SKB allocated */
         spinlock_t lock;
-};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
+};                              /* Not transferred over network, so not  __packed */
 
 struct alive_command_responce {
         u8 alive_command;
@@ -745,21 +745,21 @@ struct alive_command_responce {
         __le16 reserved4;
         u8 time_stamp[5];       /* month, day, year, hours, minutes */
         u8 ucode_valid;
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_MAX_RATES 12
 
 struct ipw_rates {
         u8 num_rates;
         u8 rates[IPW_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct command_block {
         unsigned int control;
         u32 source_addr;
         u32 dest_addr;
         unsigned int status;
-} __attribute__ ((packed));
+} __packed;
 
 #define CB_NUMBER_OF_ELEMENTS_SMALL 64
 struct fw_image_desc {
@@ -792,7 +792,7 @@ struct ipw_sys_config {
         u8 accept_all_mgmt_frames;
         u8 pass_noise_stats_to_host;
         u8 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_multicast_addr {
         u8 num_of_multicast_addresses;
@@ -801,7 +801,7 @@ struct ipw_multicast_addr {
         u8 mac2[6];
         u8 mac3[6];
         u8 mac4[6];
-} __attribute__ ((packed));
+} __packed;
 
 #define DCW_WEP_KEY_INDEX_MASK          0x03    /* bits [0:1] */
 #define DCW_WEP_KEY_SEC_TYPE_MASK       0x30    /* bits [4:5] */
@@ -822,7 +822,7 @@ struct ipw_wep_key {
         u8 key_index;
         u8 key_size;
         u8 key[16];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_tgi_tx_key {
         u8 key_id;
@@ -831,7 +831,7 @@ struct ipw_tgi_tx_key {
         u8 flags;
         u8 key[16];
         __le32 tx_counter[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_SCAN_CHANNELS 54
 
@@ -840,7 +840,7 @@ struct ipw_scan_request {
         __le16 dwell_time;
         u8 channels_list[IPW_SCAN_CHANNELS];
         u8 channels_reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         IPW_SCAN_PASSIVE_TILL_FIRST_BEACON_SCAN = 0,
@@ -857,7 +857,7 @@ struct ipw_scan_request_ext {
         u8 scan_type[IPW_SCAN_CHANNELS / 2];
         u8 reserved;
         __le16 dwell_time[IPW_SCAN_TYPES];
-} __attribute__ ((packed));
+} __packed;
 
 static inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index)
 {
@@ -902,7 +902,7 @@ struct ipw_associate {
         u8 smr;
         u8 reserved1;
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_supported_rates {
         u8 ieee_mode;
@@ -910,36 +910,36 @@ struct ipw_supported_rates {
         u8 purpose;
         u8 reserved;
         u8 supported_rates[IPW_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rts_threshold {
         __le16 rts_threshold;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_frag_threshold {
         __le16 frag_threshold;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_retry_limit {
         u8 short_retry_limit;
         u8 long_retry_limit;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_dino_config {
         __le32 dino_config_addr;
         __le16 dino_config_size;
         u8 dino_response;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_aironet_info {
         u8 id;
         u8 length;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rx_key {
         u8 station_index;
@@ -950,25 +950,25 @@ struct ipw_rx_key {
         u8 station_address[6];
         u8 key_index;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_country_channel_info {
         u8 first_channel;
         u8 no_channels;
         s8 max_tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_country_info {
         u8 id;
         u8 length;
         u8 country_str[3];
         struct ipw_country_channel_info groups[7];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_channel_tx_power {
         u8 channel_number;
         s8 tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 #define SCAN_ASSOCIATED_INTERVAL (HZ)
 #define SCAN_INTERVAL (HZ / 10)
@@ -979,18 +979,18 @@ struct ipw_tx_power {
         u8 num_channels;
         u8 ieee_mode;
         struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_rsn_capabilities {
         u8 id;
         u8 length;
         __le16 version;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_sensitivity_calib {
         __le16 beacon_rssi_raw;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * Host command structure.
@@ -1019,7 +1019,7 @@ struct ipw_cmd {	 /* XXX */
    * nParams=(len+3)/4+status_len
    */
         u32 param[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define STATUS_HCMD_ACTIVE      (1<<0)  /**< host command in progress */
 
@@ -1114,7 +1114,7 @@ struct ipw_event {	 /* XXX */
         u32 event;
         u32 time;
         u32 data;
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_fw_error {    /* XXX */
         unsigned long jiffies;
@@ -1125,7 +1125,7 @@ struct ipw_fw_error {	 /* XXX */
         struct ipw_error_elem *elem;
         struct ipw_event *log;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 #ifdef CONFIG_IPW2200_PROMISCUOUS
 
@@ -1170,7 +1170,7 @@ struct ipw_rt_hdr {
         s8 rt_dbmnoise;
         u8 rt_antenna;  /* antenna number */
         u8 payload[0];  /* payload... */
-} __attribute__ ((packed));
+} __packed;
 #endif
 
 struct ipw_priv {
@@ -1957,7 +1957,7 @@ enum {
 struct ipw_fixed_rate {
         __le16 tx_rates;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define IPW_INDIRECT_ADDR_MASK (~0x3ul)
 
@@ -1966,14 +1966,14 @@ struct host_cmd {
         u8 len;
         u16 reserved;
         u32 *param;
-} __attribute__ ((packed));     /* XXX */
+} __packed;     /* XXX */
 
 struct cmdlog_host_cmd {
         u8 cmd;
         u8 len;
         __le16 reserved;
         char param[124];
-} __attribute__ ((packed));
+} __packed;
 
 struct ipw_cmd_log {
         unsigned long jiffies;
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h
index 284b0e4cb81..4736861bc4f 100644
--- a/drivers/net/wireless/ipw2x00/libipw.h
+++ b/drivers/net/wireless/ipw2x00/libipw.h
@@ -154,7 +154,7 @@ struct libipw_snap_hdr {
         u8 ctrl;                /* always 0x03 */
         u8 oui[P80211_OUI_LEN]; /* organizational universal id */
 
-} __attribute__ ((packed));
+} __packed;
 
 #define SNAP_SIZE sizeof(struct libipw_snap_hdr)
 
@@ -323,7 +323,7 @@ struct libipw_security {
         u8 keys[WEP_KEYS][SCM_KEY_LEN];
         u8 level;
         u16 flags;
-} __attribute__ ((packed));
+} __packed;
 
 /*
 
@@ -347,7 +347,7 @@ struct libipw_hdr_1addr {
         __le16 duration_id;
         u8 addr1[ETH_ALEN];
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_2addr {
         __le16 frame_ctl;
@@ -355,7 +355,7 @@ struct libipw_hdr_2addr {
         u8 addr1[ETH_ALEN];
         u8 addr2[ETH_ALEN];
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_3addr {
         __le16 frame_ctl;
@@ -365,7 +365,7 @@ struct libipw_hdr_3addr {
         u8 addr3[ETH_ALEN];
         __le16 seq_ctl;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_4addr {
         __le16 frame_ctl;
@@ -376,7 +376,7 @@ struct libipw_hdr_4addr {
         __le16 seq_ctl;
         u8 addr4[ETH_ALEN];
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_hdr_3addrqos {
         __le16 frame_ctl;
@@ -387,13 +387,13 @@ struct libipw_hdr_3addrqos {
         __le16 seq_ctl;
         u8 payload[0];
         __le16 qos_ctl;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_info_element {
         u8 id;
         u8 len;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * These are the data types that can make up management packets
@@ -406,7 +406,7 @@ struct libipw_info_element {
         u16 listen_interval;
         struct {
                 u16 association_id:14, reserved:2;
-        } __attribute__ ((packed));
+        } __packed;
         u32 time_stamp[2];
         u16 reason;
         u16 status;
@@ -419,7 +419,7 @@ struct libipw_auth {
         __le16 status;
         /* challenge */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_channel_switch {
         u8 id;
@@ -427,7 +427,7 @@ struct libipw_channel_switch {
         u8 mode;
         u8 channel;
         u8 count;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_action {
         struct libipw_hdr_3addr header;
@@ -441,12 +441,12 @@ struct libipw_action {
                 struct libipw_channel_switch channel_switch;
 
         } format;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_disassoc {
         struct libipw_hdr_3addr header;
         __le16 reason;
-} __attribute__ ((packed));
+} __packed;
 
 /* Alias deauth for disassoc */
 #define libipw_deauth libipw_disassoc
@@ -455,7 +455,7 @@ struct libipw_probe_request {
         struct libipw_hdr_3addr header;
         /* SSID, supported rates */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_probe_response {
         struct libipw_hdr_3addr header;
@@ -465,7 +465,7 @@ struct libipw_probe_response {
         /* SSID, supported rates, FH params, DS params,
          * CF params, IBSS params, TIM (if beacon), RSN */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* Alias beacon for probe_response */
 #define libipw_beacon libipw_probe_response
@@ -476,7 +476,7 @@ struct libipw_assoc_request {
         __le16 listen_interval;
         /* SSID, supported rates, RSN */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_reassoc_request {
         struct libipw_hdr_3addr header;
@@ -484,7 +484,7 @@ struct libipw_reassoc_request {
         __le16 listen_interval;
         u8 current_ap[ETH_ALEN];
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_assoc_response {
         struct libipw_hdr_3addr header;
@@ -493,7 +493,7 @@ struct libipw_assoc_response {
         __le16 aid;
         /* supported rates */
         struct libipw_info_element info_element[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_txb {
         u8 nr_frags;
@@ -555,19 +555,19 @@ struct libipw_qos_information_element {
         u8 qui_subtype;
         u8 version;
         u8 ac_info;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_ac_parameter {
         u8 aci_aifsn;
         u8 ecw_min_max;
         __le16 tx_op_limit;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_parameter_info {
         struct libipw_qos_information_element info_element;
         u8 reserved;
         struct libipw_qos_ac_parameter ac_params_record[QOS_QUEUE_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_parameters {
         __le16 cw_min[QOS_QUEUE_NUM];
@@ -575,7 +575,7 @@ struct libipw_qos_parameters {
         u8 aifs[QOS_QUEUE_NUM];
         u8 flag[QOS_QUEUE_NUM];
         __le16 tx_op_limit[QOS_QUEUE_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_qos_data {
         struct libipw_qos_parameters parameters;
@@ -588,7 +588,7 @@ struct libipw_qos_data {
 struct libipw_tim_parameters {
         u8 tim_count;
         u8 tim_period;
-} __attribute__ ((packed));
+} __packed;
 
 /*******************************************************/
 
@@ -606,7 +606,7 @@ struct libipw_basic_report {
         __le64 start_time;
         __le16 duration;
         u8 map;
-} __attribute__ ((packed));
+} __packed;
 
 enum {                          /* libipw_measurement_request.mode */
         /* Bit 0 is reserved */
@@ -627,7 +627,7 @@ struct libipw_measurement_params {
         u8 channel;
         __le64 start_time;
         __le16 duration;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_measurement_request {
         struct libipw_info_element ie;
@@ -635,7 +635,7 @@ struct libipw_measurement_request {
         u8 mode;
         u8 type;
         struct libipw_measurement_params params[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_measurement_report {
         struct libipw_info_element ie;
@@ -645,17 +645,17 @@ struct libipw_measurement_report {
         union {
                 struct libipw_basic_report basic[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_tpc_report {
         u8 transmit_power;
         u8 link_margin;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_channel_map {
         u8 channel;
         u8 map;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_ibss_dfs {
         struct libipw_info_element ie;
@@ -668,14 +668,14 @@ struct libipw_csa {
         u8 mode;
         u8 channel;
         u8 count;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_quiet {
         u8 count;
         u8 period;
         u8 duration;
         u8 offset;
-} __attribute__ ((packed));
+} __packed;
 
 struct libipw_network {
         /* These entries are used to identify a unique network */
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-fh.h b/drivers/net/wireless/iwlwifi/iwl-3945-fh.h
index 042f6bc0df1..2c9ed2b502a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-fh.h
@@ -175,13 +175,13 @@
 struct iwl3945_tfd_tb {
         __le32 addr;
         __le32 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_tfd {
         __le32 control_flags;
         struct iwl3945_tfd_tb tbs[4];
         u8 __pad[28];
-} __attribute__ ((packed));
+} __packed;
 
 
 #endif /* __iwl_3945_fh_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
index 91bcb4e3cdf..7c731a79363 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
@@ -96,7 +96,7 @@ struct iwl3945_eeprom_txpower_sample {
         u8 gain_index;          /* index into power (gain) setup table ... */
         s8 power;               /* ... for this pwr level for this chnl group */
         u16 v_det;              /* PA output voltage */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Mappings of Tx power levels -> nominal radio/DSP gain table indexes.
@@ -117,7 +117,7 @@ struct iwl3945_eeprom_txpower_group {
         u8 group_channel;       /* "representative" channel # in this band */
         s16 temperature;        /* h/w temperature at factory calib this band
                                  * (signed) */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Temperature-based Tx-power compensation data, not band-specific.
@@ -131,7 +131,7 @@ struct iwl3945_eeprom_temperature_corr {
         u32 Tc;
         u32 Td;
         u32 Te;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * EEPROM map
@@ -215,7 +215,7 @@ struct iwl3945_eeprom {
 /* abs.ofs: 512 */
         struct iwl3945_eeprom_temperature_corr corrections;  /* abs.ofs: 832 */
         u8 reserved16[172];     /* fill out to full 1024 byte block */
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL3945_EEPROM_IMG_SIZE 1024
 
@@ -274,7 +274,7 @@ static inline int iwl3945_hw_valid_rtc_data_addr(u32 addr)
  * and &iwl3945_shared.rx_read_ptr[0] is provided to FH_RCSR_RPTR_ADDR(0) */
 struct iwl3945_shared {
         __le32 tx_base_ptr[8];
-} __attribute__ ((packed));
+} __packed;
 
 static inline u8 iwl3945_hw_get_rate(__le16 rate_n_flags)
 {
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index cd4b61ae25b..9166794eda0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -787,6 +787,6 @@ enum {
 struct iwl4965_scd_bc_tbl {
         __le16 tfd_offset[TFD_QUEUE_BC_SIZE];
         u8 pad[1024 - (TFD_QUEUE_BC_SIZE) * sizeof(__le16)];
-} __attribute__ ((packed));
+} __packed;
 
 #endif /* !__iwl_4965_hw_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index f9a3fbb6338..a52b82c8e7a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -112,7 +112,7 @@
  */
 struct iwlagn_scd_bc_tbl {
         __le16 tfd_offset[TFD_QUEUE_BC_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 
 #endif /* __iwl_agn_hw_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 49849256591..28b1098334f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -227,7 +227,7 @@ struct iwl_cmd_header {
 
         /* command or response/notification data follows immediately */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 
 /**
@@ -247,7 +247,7 @@ struct iwl_cmd_header {
 struct iwl3945_tx_power {
         u8 tx_gain;             /* gain for analog radio */
         u8 dsp_atten;           /* gain for DSP */
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl3945_power_per_rate
@@ -258,7 +258,7 @@ struct iwl3945_power_per_rate {
         u8 rate;                /* plcp */
         struct iwl3945_tx_power tpc;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * iwlagn rate_n_flags bit fields
@@ -389,7 +389,7 @@ union iwl4965_tx_power_dual_stream {
  */
 struct tx_power_dual_stream {
         __le32 dw;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl4965_tx_power_db
@@ -398,7 +398,7 @@ struct tx_power_dual_stream {
  */
 struct iwl4965_tx_power_db {
         struct tx_power_dual_stream power_tbl[POWER_TABLE_NUM_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * Command REPLY_TX_POWER_DBM_CMD = 0x98
@@ -412,7 +412,7 @@ struct iwl5000_tx_power_dbm_cmd {
         u8 flags;
         s8 srv_chan_lmt; /*in half-dBm (e.g. 30 = 15 dBm) */
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * Command TX_ANT_CONFIGURATION_CMD = 0x98
@@ -422,7 +422,7 @@ struct iwl5000_tx_power_dbm_cmd {
  */
 struct iwl_tx_ant_config_cmd {
         __le32 valid;
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (0a)
@@ -478,7 +478,7 @@ struct iwl_init_alive_resp {
         __le32 therm_r4[2];     /* signed */
         __le32 tx_atten[5][2];  /* signed MIMO gain comp, 5 freq groups,
                                  * 2 Tx chains */
-} __attribute__ ((packed));
+} __packed;
 
 
 /**
@@ -570,7 +570,7 @@ struct iwl_alive_resp {
         __le32 error_event_table_ptr;   /* SRAM address for error log */
         __le32 timestamp;
         __le32 is_valid;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_ERROR = 0x2 (response only, not a command)
@@ -582,7 +582,7 @@ struct iwl_error_resp {
         __le16 bad_cmd_seq_num;
         __le32 error_info;
         __le64 timestamp;
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (1)
@@ -718,7 +718,7 @@ struct iwl3945_rxon_cmd {
         __le32 filter_flags;
         __le16 channel;
         __le16 reserved5;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_rxon_cmd {
         u8 node_addr[6];
@@ -738,7 +738,7 @@ struct iwl4965_rxon_cmd {
         __le16 channel;
         u8 ofdm_ht_single_stream_basic_rates;
         u8 ofdm_ht_dual_stream_basic_rates;
-} __attribute__ ((packed));
+} __packed;
 
 /* 5000 HW just extend this command */
 struct iwl_rxon_cmd {
@@ -763,7 +763,7 @@ struct iwl_rxon_cmd {
         u8 reserved5;
         __le16 acquisition_data;
         __le16 reserved6;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)
@@ -774,7 +774,7 @@ struct iwl3945_rxon_assoc_cmd {
         u8 ofdm_basic_rates;
         u8 cck_basic_rates;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_rxon_assoc_cmd {
         __le32 flags;
@@ -785,7 +785,7 @@ struct iwl4965_rxon_assoc_cmd {
         u8 ofdm_ht_dual_stream_basic_rates;
         __le16 rx_chain_select_flags;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl5000_rxon_assoc_cmd {
         __le32 flags;
@@ -800,7 +800,7 @@ struct iwl5000_rxon_assoc_cmd {
         __le16 rx_chain_select_flags;
         __le16 acquisition_data;
         __le32 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL_CONN_MAX_LISTEN_INTERVAL    10
 #define IWL_MAX_UCODE_BEACON_INTERVAL   4 /* 4096 */
@@ -816,7 +816,7 @@ struct iwl_rxon_time_cmd {
         __le32 beacon_init_val;
         __le16 listen_interval;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_CHANNEL_SWITCH = 0x72 (command, has simple generic response)
@@ -829,7 +829,7 @@ struct iwl3945_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         struct iwl3945_power_per_rate power[IWL_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_channel_switch_cmd {
         u8 band;
@@ -839,7 +839,7 @@ struct iwl4965_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         struct iwl4965_tx_power_db tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl5000_channel_switch_cmd
@@ -860,7 +860,7 @@ struct iwl5000_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         __le32 reserved[2][IWL_PWR_NUM_HT_OFDM_ENTRIES + IWL_PWR_CCK_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct iwl6000_channel_switch_cmd
@@ -881,7 +881,7 @@ struct iwl6000_channel_switch_cmd {
         __le32 rxon_filter_flags;
         __le32 switch_time;
         __le32 reserved[3][IWL_PWR_NUM_HT_OFDM_ENTRIES + IWL_PWR_CCK_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * CHANNEL_SWITCH_NOTIFICATION = 0x73 (notification only, not a command)
@@ -890,7 +890,7 @@ struct iwl_csa_notification {
         __le16 band;
         __le16 channel;
         __le32 status;          /* 0 - OK, 1 - fail */
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (2)
@@ -920,7 +920,7 @@ struct iwl_ac_qos {
         u8 aifsn;
         u8 reserved1;
         __le16 edca_txop;
-} __attribute__ ((packed));
+} __packed;
 
 /* QoS flags defines */
 #define QOS_PARAM_FLG_UPDATE_EDCA_MSK   cpu_to_le32(0x01)
@@ -939,7 +939,7 @@ struct iwl_ac_qos {
 struct iwl_qosparam_cmd {
         __le32 qos_flags;
         struct iwl_ac_qos ac[AC_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (3)
@@ -1014,7 +1014,7 @@ struct iwl4965_keyinfo {
         u8 key_offset;
         u8 reserved2;
         u8 key[16];             /* 16-byte unicast decryption key */
-} __attribute__ ((packed));
+} __packed;
 
 /* 5000 */
 struct iwl_keyinfo {
@@ -1028,7 +1028,7 @@ struct iwl_keyinfo {
         __le64 tx_secur_seq_cnt;
         __le64 hw_tkip_mic_rx_key;
         __le64 hw_tkip_mic_tx_key;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct sta_id_modify
@@ -1048,7 +1048,7 @@ struct sta_id_modify {
         u8 sta_id;
         u8 modify_mask;
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_ADD_STA = 0x18 (command)
@@ -1102,7 +1102,7 @@ struct iwl3945_addsta_cmd {
         /* Starting Sequence Number for added block-ack support.
          * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */
         __le16 add_immediate_ba_ssn;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_addsta_cmd {
         u8 mode;                /* 1: modify existing, 0: add new station */
@@ -1139,7 +1139,7 @@ struct iwl4965_addsta_cmd {
         __le16 sleep_tx_count;
 
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 /* 5000 */
 struct iwl_addsta_cmd {
@@ -1177,7 +1177,7 @@ struct iwl_addsta_cmd {
         __le16 sleep_tx_count;
 
         __le16 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ADD_STA_SUCCESS_MSK             0x1
@@ -1189,7 +1189,7 @@ struct iwl_addsta_cmd {
  */
 struct iwl_add_sta_resp {
         u8 status;      /* ADD_STA_* */
-} __attribute__ ((packed));
+} __packed;
 
 #define REM_STA_SUCCESS_MSK              0x1
 /*
@@ -1197,7 +1197,7 @@ struct iwl_add_sta_resp {
  */
 struct iwl_rem_sta_resp {
         u8 status;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  *  REPLY_REM_STA = 0x19 (command)
@@ -1207,7 +1207,7 @@ struct iwl_rem_sta_cmd {
         u8 reserved[3];
         u8 addr[ETH_ALEN]; /* MAC addr of the first station */
         u8 reserved2[2];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_WEP_KEY = 0x20
@@ -1219,7 +1219,7 @@ struct iwl_wep_key {
         u8 key_size;
         u8 reserved2[3];
         u8 key[16];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_wep_cmd {
         u8 num_keys;
@@ -1227,7 +1227,7 @@ struct iwl_wep_cmd {
         u8 flags;
         u8 reserved;
         struct iwl_wep_key key[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define WEP_KEY_WEP_TYPE 1
 #define WEP_KEYS_MAX 4
@@ -1281,7 +1281,7 @@ struct iwl3945_rx_frame_stats {
         __le16 sig_avg;
         __le16 noise_diff;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_rx_frame_hdr {
         __le16 channel;
@@ -1290,13 +1290,13 @@ struct iwl3945_rx_frame_hdr {
         u8 rate;
         __le16 len;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_rx_frame_end {
         __le32 status;
         __le64 timestamp;
         __le32 beacon_timestamp;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_3945_RX = 0x1b (response only, not a command)
@@ -1310,7 +1310,7 @@ struct iwl3945_rx_frame {
         struct iwl3945_rx_frame_stats stats;
         struct iwl3945_rx_frame_hdr hdr;
         struct iwl3945_rx_frame_end end;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL39_RX_FRAME_SIZE     (4 + sizeof(struct iwl3945_rx_frame))
 
@@ -1326,7 +1326,7 @@ struct iwl4965_rx_non_cfg_phy {
         __le16 agc_info;        /* agc code 0:6, agc dB 7:13, reserved 14:15 */
         u8 rssi_info[6];        /* we use even entries, 0/2/4 for A/B/C rssi */
         u8 pad[0];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define IWL50_RX_RES_PHY_CNT 8
@@ -1344,7 +1344,7 @@ struct iwl4965_rx_non_cfg_phy {
 
 struct iwl5000_non_cfg_phy {
         __le32 non_cfg_phy[IWL50_RX_RES_PHY_CNT];  /* up to 8 phy entries */
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -1364,12 +1364,12 @@ struct iwl_rx_phy_res {
         __le32 rate_n_flags;    /* RATE_MCS_* */
         __le16 byte_count;      /* frame's byte-count */
         __le16 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_rx_mpdu_res_start {
         __le16 byte_count;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -1556,7 +1556,7 @@ struct iwl3945_tx_cmd {
          */
         u8 payload[0];
         struct ieee80211_hdr hdr[0];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX = 0x1c (response)
@@ -1568,7 +1568,7 @@ struct iwl3945_tx_resp {
         u8 rate;
         __le32 wireless_media_time;
         __le32 status;          /* TX status */
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -1580,7 +1580,7 @@ struct iwl_dram_scratch {
         u8 try_cnt;             /* Tx attempts */
         u8 bt_kill_cnt;         /* Tx attempts blocked by Bluetooth device */
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_tx_cmd {
         /*
@@ -1659,7 +1659,7 @@ struct iwl_tx_cmd {
          */
         u8 payload[0];
         struct ieee80211_hdr hdr[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* TX command response is sent after *3945* transmission attempts.
  *
@@ -1825,7 +1825,7 @@ enum {
 struct agg_tx_status {
         __le16 status;
         __le16 sequence;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_tx_resp {
         u8 frame_count;         /* 1 no aggregation, >1 aggregation */
@@ -1862,7 +1862,7 @@ struct iwl4965_tx_resp {
                 __le32 status;
                 struct agg_tx_status agg_status[0]; /* for each agg frame */
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * definitions for initial rate index field
@@ -1926,7 +1926,7 @@ struct iwl5000_tx_resp {
          */
         struct agg_tx_status status;    /* TX status (in aggregation -
                                          * status of 1st frame) */
-} __attribute__ ((packed));
+} __packed;
 /*
  * REPLY_COMPRESSED_BA = 0xc5 (response only, not a command)
  *
@@ -1944,7 +1944,7 @@ struct iwl_compressed_ba_resp {
         __le64 bitmap;
         __le16 scd_flow;
         __le16 scd_ssn;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX_PWR_TABLE_CMD = 0x97 (command, has simple generic response)
@@ -1957,14 +1957,14 @@ struct iwl3945_txpowertable_cmd {
         u8 reserved;
         __le16 channel;
         struct iwl3945_power_per_rate power[IWL_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_txpowertable_cmd {
         u8 band;                /* 0: 5 GHz, 1: 2.4 GHz */
         u8 reserved;
         __le16 channel;
         struct iwl4965_tx_power_db tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 
 /**
@@ -1986,13 +1986,13 @@ struct iwl3945_rate_scaling_info {
         __le16 rate_n_flags;
         u8 try_cnt;
         u8 next_rate_index;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl3945_rate_scaling_cmd {
         u8 table_id;
         u8 reserved[3];
         struct iwl3945_rate_scaling_info table[IWL_MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 
 /*RS_NEW_API: only TLC_RTS remains and moved to bit 0 */
@@ -2039,7 +2039,7 @@ struct iwl_link_qual_general_params {
          * TX FIFOs above 3 use same value (typically 0) as TX FIFO 3.
          */
         u8 start_rate_index[LINK_QUAL_AC_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 #define LINK_QUAL_AGG_TIME_LIMIT_DEF    (4000) /* 4 milliseconds */
 #define LINK_QUAL_AGG_TIME_LIMIT_MAX    (65535)
@@ -2080,7 +2080,7 @@ struct iwl_link_qual_agg_params {
         u8 agg_frame_cnt_limit;
 
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)
@@ -2286,7 +2286,7 @@ struct iwl_link_quality_cmd {
                 __le32 rate_n_flags;    /* RATE_MCS_*, IWL_RATE_* */
         } rs_table[LINK_QUAL_MAX_RETRY_NUM];
         __le32 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * BT configuration enable flags:
@@ -2327,7 +2327,7 @@ struct iwl_bt_cmd {
         u8 reserved;
         __le32 kill_ack_mask;
         __le32 kill_cts_mask;
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (6)
@@ -2352,7 +2352,7 @@ struct iwl_measure_channel {
         u8 channel;             /* channel to measure */
         u8 type;                /* see enum iwl_measure_type */
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (command)
@@ -2371,7 +2371,7 @@ struct iwl_spectrum_cmd {
         __le16 channel_count;   /* minimum 1, maximum 10 */
         __le16 reserved3;
         struct iwl_measure_channel channels[10];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (response)
@@ -2382,7 +2382,7 @@ struct iwl_spectrum_resp {
         __le16 status;          /* 0 - command will be handled
                                  * 1 - cannot handle (conflicts with another
                                  *     measurement) */
-} __attribute__ ((packed));
+} __packed;
 
 enum iwl_measurement_state {
         IWL_MEASUREMENT_START = 0,
@@ -2405,13 +2405,13 @@ enum iwl_measurement_status {
 struct iwl_measurement_histogram {
         __le32 ofdm[NUM_ELEMENTS_IN_HISTOGRAM]; /* in 0.8usec counts */
         __le32 cck[NUM_ELEMENTS_IN_HISTOGRAM];  /* in 1usec counts */
-} __attribute__ ((packed));
+} __packed;
 
 /* clear channel availability counters */
 struct iwl_measurement_cca_counters {
         __le32 ofdm;
         __le32 cck;
-} __attribute__ ((packed));
+} __packed;
 
 enum iwl_measure_type {
         IWL_MEASURE_BASIC = (1 << 0),
@@ -2447,7 +2447,7 @@ struct iwl_spectrum_notification {
         struct iwl_measurement_histogram histogram;
         __le32 stop_time;       /* lower 32-bits of TSF */
         __le32 status;          /* see iwl_measurement_status */
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (7)
@@ -2503,7 +2503,7 @@ struct iwl3945_powertable_cmd {
         __le32 rx_data_timeout;
         __le32 tx_data_timeout;
         __le32 sleep_interval[IWL_POWER_VEC_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_powertable_cmd {
         __le16 flags;
@@ -2513,7 +2513,7 @@ struct iwl_powertable_cmd {
         __le32 tx_data_timeout;
         __le32 sleep_interval[IWL_POWER_VEC_SIZE];
         __le32 keep_alive_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * PM_SLEEP_NOTIFICATION = 0x7A (notification only, not a command)
@@ -2526,7 +2526,7 @@ struct iwl_sleep_notification {
         __le32 sleep_time;
         __le32 tsf_low;
         __le32 bcon_timer;
-} __attribute__ ((packed));
+} __packed;
 
 /* Sleep states.  3945 and 4965 identical. */
 enum {
@@ -2551,14 +2551,14 @@ enum {
 #define CARD_STATE_CMD_HALT    0x02     /* Power down permanently */
 struct iwl_card_state_cmd {
         __le32 status;          /* CARD_STATE_CMD_* request new power state */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * CARD_STATE_NOTIFICATION = 0xa1 (notification only, not a command)
  */
 struct iwl_card_state_notif {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define HW_CARD_DISABLED   0x01
 #define SW_CARD_DISABLED   0x02
@@ -2569,14 +2569,14 @@ struct iwl_ct_kill_config {
         __le32   reserved;
         __le32   critical_temperature_M;
         __le32   critical_temperature_R;
-}  __attribute__ ((packed));
+}  __packed;
 
 /* 1000, and 6x00 */
 struct iwl_ct_kill_throttling_config {
         __le32   critical_temperature_exit;
         __le32   reserved;
         __le32   critical_temperature_enter;
-}  __attribute__ ((packed));
+}  __packed;
 
 /******************************************************************************
  * (8)
@@ -2621,7 +2621,7 @@ struct iwl3945_scan_channel {
         struct iwl3945_tx_power tpc;
         __le16 active_dwell;    /* in 1024-uSec TU (time units), typ 5-50 */
         __le16 passive_dwell;   /* in 1024-uSec TU (time units), typ 20-500 */
-} __attribute__ ((packed));
+} __packed;
 
 /* set number of direct probes u8 type */
 #define IWL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))
@@ -2640,7 +2640,7 @@ struct iwl_scan_channel {
         u8 dsp_atten;           /* gain for DSP */
         __le16 active_dwell;    /* in 1024-uSec TU (time units), typ 5-50 */
         __le16 passive_dwell;   /* in 1024-uSec TU (time units), typ 20-500 */
-} __attribute__ ((packed));
+} __packed;
 
 /* set number of direct probes __le32 type */
 #define IWL_SCAN_PROBE_MASK(n)  cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))
@@ -2657,7 +2657,7 @@ struct iwl_ssid_ie {
         u8 id;
         u8 len;
         u8 ssid[32];
-} __attribute__ ((packed));
+} __packed;
 
 #define PROBE_OPTION_MAX_3945           4
 #define PROBE_OPTION_MAX                20
@@ -2763,7 +2763,7 @@ struct iwl3945_scan_cmd {
          * before requesting another scan.
          */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_scan_cmd {
         __le16 len;
@@ -2807,7 +2807,7 @@ struct iwl_scan_cmd {
          * before requesting another scan.
          */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* Can abort will notify by complete notification with abort status. */
 #define CAN_ABORT_STATUS        cpu_to_le32(0x1)
@@ -2819,7 +2819,7 @@ struct iwl_scan_cmd {
  */
 struct iwl_scanreq_notification {
         __le32 status;          /* 1: okay, 2: cannot fulfill request */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * SCAN_START_NOTIFICATION = 0x82 (notification only, not a command)
@@ -2832,7 +2832,7 @@ struct iwl_scanstart_notification {
         u8 band;
         u8 reserved[2];
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 #define  SCAN_OWNER_STATUS 0x1;
 #define  MEASURE_OWNER_STATUS 0x2;
@@ -2848,7 +2848,7 @@ struct iwl_scanresults_notification {
         __le32 tsf_low;
         __le32 tsf_high;
         __le32 statistics[NUMBER_OF_STATISTICS];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * SCAN_COMPLETE_NOTIFICATION = 0x84 (notification only, not a command)
@@ -2860,7 +2860,7 @@ struct iwl_scancomplete_notification {
         u8 last_channel;
         __le32 tsf_low;
         __le32 tsf_high;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -2878,14 +2878,14 @@ struct iwl3945_beacon_notif {
         __le32 low_tsf;
         __le32 high_tsf;
         __le32 ibss_mgr_status;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl4965_beacon_notif {
         struct iwl4965_tx_resp beacon_notify_hdr;
         __le32 low_tsf;
         __le32 high_tsf;
         __le32 ibss_mgr_status;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * REPLY_TX_BEACON = 0x91 (command, has simple generic response)
@@ -2897,7 +2897,7 @@ struct iwl3945_tx_beacon_cmd {
         u8 tim_size;
         u8 reserved1;
         struct ieee80211_hdr frame[0];  /* beacon frame */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_tx_beacon_cmd {
         struct iwl_tx_cmd tx;
@@ -2905,7 +2905,7 @@ struct iwl_tx_beacon_cmd {
         u8 tim_size;
         u8 reserved1;
         struct ieee80211_hdr frame[0];  /* beacon frame */
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (10)
@@ -2931,7 +2931,7 @@ struct rate_histogram {
                 __le32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
                 __le32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
         } failed;
-} __attribute__ ((packed));
+} __packed;
 
 /* statistics command response */
 
@@ -2951,7 +2951,7 @@ struct iwl39_statistics_rx_phy {
         __le32 rxe_frame_limit_overrun;
         __le32 sent_ack_cnt;
         __le32 sent_cts_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_rx_non_phy {
         __le32 bogus_cts;       /* CTS received when not expecting CTS */
@@ -2962,13 +2962,13 @@ struct iwl39_statistics_rx_non_phy {
                                  * filtering process */
         __le32 non_channel_beacons;     /* beacons with our bss id but not on
                                          * our serving channel */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_rx {
         struct iwl39_statistics_rx_phy ofdm;
         struct iwl39_statistics_rx_phy cck;
         struct iwl39_statistics_rx_non_phy general;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_tx {
         __le32 preamble_cnt;
@@ -2980,20 +2980,20 @@ struct iwl39_statistics_tx {
         __le32 ack_timeout;
         __le32 expected_ack_cnt;
         __le32 actual_ack_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_dbg {
         __le32 burst_check;
         __le32 burst_count;
         __le32 reserved[4];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_div {
         __le32 tx_on_a;
         __le32 tx_on_b;
         __le32 exec_time;
         __le32 probe_time;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl39_statistics_general {
         __le32 temperature;
@@ -3003,7 +3003,7 @@ struct iwl39_statistics_general {
         __le32 slots_idle;
         __le32 ttl_timestamp;
         struct iwl39_statistics_div div;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_rx_phy {
         __le32 ina_cnt;
@@ -3026,7 +3026,7 @@ struct statistics_rx_phy {
         __le32 mh_format_err;
         __le32 re_acq_main_rssi_sum;
         __le32 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_rx_ht_phy {
         __le32 plcp_err;
@@ -3039,7 +3039,7 @@ struct statistics_rx_ht_phy {
         __le32 agg_mpdu_cnt;
         __le32 agg_cnt;
         __le32 unsupport_mcs;
-} __attribute__ ((packed));
+} __packed;
 
 #define INTERFERENCE_DATA_AVAILABLE      cpu_to_le32(1)
 
@@ -3074,14 +3074,14 @@ struct statistics_rx_non_phy {
         __le32 beacon_energy_a;
         __le32 beacon_energy_b;
         __le32 beacon_energy_c;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_rx {
         struct statistics_rx_phy ofdm;
         struct statistics_rx_phy cck;
         struct statistics_rx_non_phy general;
         struct statistics_rx_ht_phy ofdm_ht;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct statistics_tx_power - current tx power
@@ -3095,7 +3095,7 @@ struct statistics_tx_power {
         u8 ant_b;
         u8 ant_c;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_tx_non_phy_agg {
         __le32 ba_timeout;
@@ -3108,7 +3108,7 @@ struct statistics_tx_non_phy_agg {
         __le32 underrun;
         __le32 bt_prio_kill;
         __le32 rx_ba_rsp_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_tx {
         __le32 preamble_cnt;
@@ -3133,7 +3133,7 @@ struct statistics_tx {
          */
         struct statistics_tx_power tx_power;
         __le32 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct statistics_div {
@@ -3143,7 +3143,7 @@ struct statistics_div {
         __le32 probe_time;
         __le32 reserved1;
         __le32 reserved2;
-} __attribute__ ((packed));
+} __packed;
 
 struct statistics_general {
         __le32 temperature;   /* radio temperature */
@@ -3163,7 +3163,7 @@ struct statistics_general {
         __le32 num_of_sos_states;
         __le32 reserved2;
         __le32 reserved3;
-} __attribute__ ((packed));
+} __packed;
 
 #define UCODE_STATISTICS_CLEAR_MSK              (0x1 << 0)
 #define UCODE_STATISTICS_FREQUENCY_MSK          (0x1 << 1)
@@ -3188,7 +3188,7 @@ struct statistics_general {
 #define IWL_STATS_CONF_DISABLE_NOTIF cpu_to_le32(0x2)/* see above */
 struct iwl_statistics_cmd {
         __le32 configuration_flags;     /* IWL_STATS_CONF_* */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * STATISTICS_NOTIFICATION = 0x9d (notification only, not a command)
@@ -3213,14 +3213,14 @@ struct iwl3945_notif_statistics {
         struct iwl39_statistics_rx rx;
         struct iwl39_statistics_tx tx;
         struct iwl39_statistics_general general;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_notif_statistics {
         __le32 flag;
         struct statistics_rx rx;
         struct statistics_tx tx;
         struct statistics_general general;
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -3252,7 +3252,7 @@ struct iwl_missed_beacon_notif {
         __le32 total_missed_becons;
         __le32 num_expected_beacons;
         __le32 num_recvd_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -3454,7 +3454,7 @@ struct iwl_missed_beacon_notif {
 struct iwl_sensitivity_cmd {
         __le16 control;                 /* always use "1" */
         __le16 table[HD_TABLE_SIZE];    /* use HD_* as index */
-} __attribute__ ((packed));
+} __packed;
 
 
 /**
@@ -3535,31 +3535,31 @@ struct iwl_calib_cfg_elmnt_s {
         __le32 send_res;
         __le32 apply_res;
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_cfg_status_s {
         struct iwl_calib_cfg_elmnt_s once;
         struct iwl_calib_cfg_elmnt_s perd;
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_cfg_cmd {
         struct iwl_calib_cfg_status_s ucd_calib_cfg;
         struct iwl_calib_cfg_status_s drv_calib_cfg;
         __le32 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_hdr {
         u8 op_code;
         u8 first_group;
         u8 groups_num;
         u8 data_valid;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_cmd {
         struct iwl_calib_hdr hdr;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* IWL_PHY_CALIBRATE_DIFF_GAIN_CMD (7) */
 struct iwl_calib_diff_gain_cmd {
@@ -3568,14 +3568,14 @@ struct iwl_calib_diff_gain_cmd {
         s8 diff_gain_b;
         s8 diff_gain_c;
         u8 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_calib_xtal_freq_cmd {
         struct iwl_calib_hdr hdr;
         u8 cap_pin1;
         u8 cap_pin2;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /* IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD */
 struct iwl_calib_chain_noise_reset_cmd {
@@ -3589,7 +3589,7 @@ struct iwl_calib_chain_noise_gain_cmd {
         u8 delta_gain_1;
         u8 delta_gain_2;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /******************************************************************************
  * (12)
@@ -3612,7 +3612,7 @@ struct iwl_led_cmd {
         u8 on;                  /* # intervals on while blinking;
                                  * "0", regardless of "off", turns LED off */
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * station priority table entries
@@ -3748,7 +3748,7 @@ struct iwl_wimax_coex_event_entry {
         u8 win_medium_prio;
         u8 reserved;
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 /* COEX flag masks */
 
@@ -3765,7 +3765,7 @@ struct iwl_wimax_coex_cmd {
         u8 flags;
         u8 reserved[3];
         struct iwl_wimax_coex_event_entry sta_prio[COEX_NUM_OF_EVENTS];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Coexistence MEDIUM NOTIFICATION
@@ -3794,7 +3794,7 @@ struct iwl_wimax_coex_cmd {
 struct iwl_coex_medium_notification {
         __le32 status;
         __le32 events;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Coexistence EVENT  Command
@@ -3809,11 +3809,11 @@ struct iwl_coex_event_cmd {
         u8 flags;
         u8 event;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwl_coex_event_resp {
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 
 /******************************************************************************
@@ -3857,7 +3857,7 @@ struct iwl_rx_packet {
                 __le32 status;
                 u8 raw[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 int iwl_agn_check_rxon_cmd(struct iwl_priv *priv);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index da54e6cd18a..338b5177029 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -138,7 +138,7 @@ struct iwl_queue {
                                 * space more than this */
         int high_mark;         /* high watermark, stop queue if free
                                 * space less than this */
-} __attribute__ ((packed));
+} __packed;
 
 /* One for each TFD */
 struct iwl_tx_info {
@@ -324,8 +324,8 @@ struct iwl_device_cmd {
                 struct iwl_tx_cmd tx;
                 struct iwl6000_channel_switch_cmd chswitch;
                 u8 payload[DEF_CMD_PAYLOAD_SIZE];
-        } __attribute__ ((packed)) cmd;
-} __attribute__ ((packed));
+        } __packed cmd;
+} __packed;
 
 #define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))
 
@@ -577,7 +577,7 @@ struct iwl_ucode_tlv {
         __le16 alternative;     /* see comment */
         __le32 length;          /* not including type/length fields */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWL_TLV_UCODE_MAGIC     0x0a4c5749
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 95aa202c85e..5488006491a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -118,7 +118,7 @@ enum {
 struct iwl_eeprom_channel {
         u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
         s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * iwl_eeprom_enhanced_txpwr structure
@@ -144,7 +144,7 @@ struct iwl_eeprom_enhanced_txpwr {
         s8 reserved;
         s8 mimo2_max;
         s8 mimo3_max;
-} __attribute__ ((packed));
+} __packed;
 
 /* 3945 Specific */
 #define EEPROM_3945_EEPROM_VERSION      (0x2f)
@@ -312,7 +312,7 @@ struct iwl_eeprom_calib_measure {
         u8 gain_idx;            /* Index into gain table */
         u8 actual_pow;          /* Measured RF output power, half-dBm */
         s8 pa_det;              /* Power amp detector level (not used) */
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -328,7 +328,7 @@ struct iwl_eeprom_calib_ch_info {
         struct iwl_eeprom_calib_measure
                 measurements[EEPROM_TX_POWER_TX_CHAINS]
                         [EEPROM_TX_POWER_MEASUREMENTS];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * txpower subband info.
@@ -345,7 +345,7 @@ struct iwl_eeprom_calib_subband_info {
         u8 ch_to;       /* channel number of highest channel in subband */
         struct iwl_eeprom_calib_ch_info ch1;
         struct iwl_eeprom_calib_ch_info ch2;
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -374,7 +374,7 @@ struct iwl_eeprom_calib_info {
         __le16 voltage;         /* signed */
         struct iwl_eeprom_calib_subband_info
                 band_info[EEPROM_TX_POWER_BANDS];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ADDRESS_MSK                 0x0000FFFF
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 113c3669b9c..a3fcbb5f2c7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -449,7 +449,7 @@ struct iwl_rb_status {
         __le16 finished_rb_num;
         __le16 finished_fr_nam;
         __le32 __unused; /* 3945 only */
-} __attribute__ ((packed));
+} __packed;
 
 
 #define TFD_QUEUE_SIZE_MAX      (256)
@@ -475,7 +475,7 @@ static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr)
 struct iwl_tfd_tb {
         __le32 lo;
         __le16 hi_n_len;
-} __attribute__((packed));
+} __packed;
 
 /**
  * struct iwl_tfd
@@ -510,7 +510,7 @@ struct iwl_tfd {
         u8 num_tbs;
         struct iwl_tfd_tb tbs[IWL_NUM_OF_TBS];
         __le32 __pad;
-} __attribute__ ((packed));
+} __packed;
 
 /* Keep Warm Size */
 #define IWL_KW_SIZE 0x1000      /* 4k */
diff --git a/drivers/net/wireless/iwlwifi/iwl-spectrum.h b/drivers/net/wireless/iwlwifi/iwl-spectrum.h
index af6babee289..c4ca0b5d77d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-spectrum.h
+++ b/drivers/net/wireless/iwlwifi/iwl-spectrum.h
@@ -42,7 +42,7 @@ struct ieee80211_basic_report {
         __le64 start_time;
         __le16 duration;
         u8 map;
-} __attribute__ ((packed));
+} __packed;
 
 enum {                          /* ieee80211_measurement_request.mode */
         /* Bit 0 is reserved */
@@ -63,13 +63,13 @@ struct ieee80211_measurement_params {
         u8 channel;
         __le64 start_time;
         __le16 duration;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_info_element {
         u8 id;
         u8 len;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_measurement_request {
         struct ieee80211_info_element ie;
@@ -77,7 +77,7 @@ struct ieee80211_measurement_request {
         u8 mode;
         u8 type;
         struct ieee80211_measurement_params params[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_measurement_report {
         struct ieee80211_info_element ie;
@@ -87,6 +87,6 @@ struct ieee80211_measurement_report {
         union {
                 struct ieee80211_basic_report basic[0];
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.h b/drivers/net/wireless/iwmc3200wifi/commands.h
index 7e16bcf5997..6421689f5e8 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.h
+++ b/drivers/net/wireless/iwmc3200wifi/commands.h
@@ -56,7 +56,7 @@
 
 struct iwm_umac_cmd_reset {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_PARAM_TBL_ORD_FIX    0x0
 #define UMAC_PARAM_TBL_ORD_VAR    0x1
@@ -220,37 +220,37 @@ struct iwm_umac_cmd_set_param_fix {
         __le16 tbl;
         __le16 key;
         __le32 value;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_set_param_var {
         __le16 tbl;
         __le16 key;
         __le16 len;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_get_param {
         __le16 tbl;
         __le16 key;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_get_param_resp {
         __le16 tbl;
         __le16 key;
         __le16 len;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_eeprom_proxy_hdr {
         __le32 type;
         __le32 offset;
         __le32 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_eeprom_proxy {
         struct iwm_umac_cmd_eeprom_proxy_hdr hdr;
         u8 buf[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_UMAC_CMD_EEPROM_TYPE_READ       0x1
 #define IWM_UMAC_CMD_EEPROM_TYPE_WRITE      0x2
@@ -267,13 +267,13 @@ struct iwm_umac_channel_info {
         u8 reserved;
         u8 flags;
         __le32 channels_mask;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_get_channel_list {
         __le16 count;
         __le16 reserved;
         struct iwm_umac_channel_info ch[0];
-} __attribute__ ((packed));
+} __packed;
 
 
 /* UMAC WiFi interface commands */
@@ -304,7 +304,7 @@ struct iwm_umac_ssid {
         u8 ssid_len;
         u8 ssid[IEEE80211_MAX_SSID_LEN];
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_scan_request {
         struct iwm_umac_wifi_if hdr;
@@ -314,7 +314,7 @@ struct iwm_umac_cmd_scan_request {
         u8 timeout; /* In seconds */
         u8 reserved;
         struct iwm_umac_ssid ssids[UMAC_WIFI_IF_PROBE_OPTION_MAX];
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_CIPHER_TYPE_NONE           0xFF
 #define UMAC_CIPHER_TYPE_USE_GROUPCAST  0x00
@@ -357,7 +357,7 @@ struct iwm_umac_security {
         u8 ucast_cipher;
         u8 mcast_cipher;
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_ibss {
         u8 beacon_interval;     /* in millisecond */
@@ -366,7 +366,7 @@ struct iwm_umac_ibss {
         u8 band;
         u8 channel;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_MODE_BSS   0
 #define UMAC_MODE_IBSS  1
@@ -385,13 +385,13 @@ struct iwm_umac_profile {
         __le16 flags;
         u8 wireless_mode;
         u8 bss_num;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_invalidate_profile {
         struct iwm_umac_wifi_if hdr;
         u8 reason;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 /* Encryption key commands */
 struct iwm_umac_key_wep40 {
@@ -400,7 +400,7 @@ struct iwm_umac_key_wep40 {
         u8 key[WLAN_KEY_LEN_WEP40];
         u8 static_key;
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_key_wep104 {
         struct iwm_umac_wifi_if hdr;
@@ -408,7 +408,7 @@ struct iwm_umac_key_wep104 {
         u8 key[WLAN_KEY_LEN_WEP104];
         u8 static_key;
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_TKIP_KEY_SIZE 16
 #define IWM_TKIP_MIC_SIZE 8
@@ -420,7 +420,7 @@ struct iwm_umac_key_tkip {
         u8 tkip_key[IWM_TKIP_KEY_SIZE];
         u8 mic_rx_key[IWM_TKIP_MIC_SIZE];
         u8 mic_tx_key[IWM_TKIP_MIC_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_key_ccmp {
         struct iwm_umac_wifi_if hdr;
@@ -428,27 +428,27 @@ struct iwm_umac_key_ccmp {
         u8 iv_count[6];
         u8 reserved[2];
         u8 key[WLAN_KEY_LEN_CCMP];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_key_remove {
         struct iwm_umac_wifi_if hdr;
         struct iwm_umac_key_hdr key_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_tx_key_id {
         struct iwm_umac_wifi_if hdr;
         u8 key_idx;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_pwr_trigger {
         struct iwm_umac_wifi_if hdr;
         __le32 reseved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_stats_req {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_cmd_stop_resume_tx {
         u8 flags;
@@ -456,7 +456,7 @@ struct iwm_umac_cmd_stop_resume_tx {
         __le16 stop_resume_tid_msk;
         __le16 last_seq_num[IWM_UMAC_TID_NR];
         u16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_CMD_PMKID_ADD   1
 #define IWM_CMD_PMKID_DEL   2
@@ -468,7 +468,7 @@ struct iwm_umac_pmkid_update {
         u8 bssid[ETH_ALEN];
         __le16 reserved;
         u8 pmkid[WLAN_PMKID_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* LMAC commands */
 int iwm_read_mac(struct iwm_priv *iwm, u8 *mac);
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h
index 13266c3842f..51d7efa15ae 100644
--- a/drivers/net/wireless/iwmc3200wifi/iwm.h
+++ b/drivers/net/wireless/iwmc3200wifi/iwm.h
@@ -162,7 +162,7 @@ struct iwm_umac_key_hdr {
         u8 mac[ETH_ALEN];
         u8 key_idx;
         u8 multicast; /* BCast encrypt & BCast decrypt of frames FROM mac */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_key {
         struct iwm_umac_key_hdr hdr;
diff --git a/drivers/net/wireless/iwmc3200wifi/lmac.h b/drivers/net/wireless/iwmc3200wifi/lmac.h
index a855a99e49b..5ddcdf8c70c 100644
--- a/drivers/net/wireless/iwmc3200wifi/lmac.h
+++ b/drivers/net/wireless/iwmc3200wifi/lmac.h
@@ -43,7 +43,7 @@ struct iwm_lmac_hdr {
         u8 id;
         u8 flags;
         __le16 seq_num;
-} __attribute__ ((packed));
+} __packed;
 
 /* LMAC commands */
 #define CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK  0x1
@@ -54,23 +54,23 @@ struct iwm_lmac_cal_cfg_elt {
         __le32 send_res; /* 1 for sending back results */
         __le32 apply_res; /* 1 for applying calibration results to HW */
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_cal_cfg_status {
         struct iwm_lmac_cal_cfg_elt init;
         struct iwm_lmac_cal_cfg_elt periodic;
         __le32 flags; /* CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_cal_cfg_cmd {
         struct iwm_lmac_cal_cfg_status ucode_cfg;
         struct iwm_lmac_cal_cfg_status driver_cfg;
         __le32 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_cal_cfg_resp {
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_CARD_STATE_SW_HW_ENABLED    0x00
 #define IWM_CARD_STATE_HW_DISABLED      0x01
@@ -80,7 +80,7 @@ struct iwm_lmac_cal_cfg_resp {
 
 struct iwm_lmac_card_state {
         __le32 flags;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * COEX_PRIORITY_TABLE_CMD
@@ -131,7 +131,7 @@ struct coex_event {
         u8 win_med_prio;
         u8 reserved;
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define COEX_FLAGS_STA_TABLE_VALID_MSK          0x1
 #define COEX_FLAGS_UNASSOC_WAKEUP_UMASK_MSK     0x4
@@ -142,7 +142,7 @@ struct iwm_coex_prio_table_cmd {
         u8 flags;
         u8 reserved[3];
         struct coex_event sta_prio[COEX_EVENTS_NUM];
-} __attribute__ ((packed));
+} __packed;
 
 /* Coexistence definitions
  *
@@ -192,7 +192,7 @@ struct iwm_ct_kill_cfg_cmd {
         u32 exit_threshold;
         u32 reserved;
         u32 entry_threshold;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* LMAC OP CODES */
@@ -428,7 +428,7 @@ struct iwm_lmac_calib_hdr {
         u8 first_grp;
         u8 grp_num;
         u8 all_data_valid;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_LMAC_CALIB_FREQ_GROUPS_NR   7
 #define IWM_CALIB_FREQ_GROUPS_NR        5
@@ -437,20 +437,20 @@ struct iwm_lmac_calib_hdr {
 struct iwm_calib_rxiq_entry {
         u16 ptam_postdist_ars;
         u16 ptam_postdist_arc;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_calib_rxiq_group {
         struct iwm_calib_rxiq_entry mode[IWM_CALIB_DC_MODES_NR];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_calib_rxiq {
         struct iwm_calib_rxiq_group group[IWM_LMAC_CALIB_FREQ_GROUPS_NR];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_calib_rxiq {
         struct iwm_lmac_calib_hdr hdr;
         struct iwm_calib_rxiq_group group[IWM_CALIB_FREQ_GROUPS_NR];
-} __attribute__ ((packed));
+} __packed;
 
 #define LMAC_STA_ID_SEED        0x0f
 #define LMAC_STA_ID_POS         0
@@ -463,7 +463,7 @@ struct iwm_lmac_power_report {
         u8 pa_integ_res_A[3];
         u8 pa_integ_res_B[3];
         u8 pa_integ_res_C[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_lmac_tx_resp {
         u8 frame_cnt; /* 1-no aggregation, greater then 1 - aggregation */
@@ -479,6 +479,6 @@ struct iwm_lmac_tx_resp {
         u8 ra_tid;
         __le16 frame_ctl;
         __le32 status;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/iwmc3200wifi/umac.h b/drivers/net/wireless/iwmc3200wifi/umac.h
index 0cbba3ecc81..4a137d334a4 100644
--- a/drivers/net/wireless/iwmc3200wifi/umac.h
+++ b/drivers/net/wireless/iwmc3200wifi/umac.h
@@ -42,19 +42,19 @@
 struct iwm_udma_in_hdr {
         __le32 cmd;
         __le32 size;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_udma_out_nonwifi_hdr {
         __le32 cmd;
         __le32 addr;
         __le32 op1_sz;
         __le32 op2;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_udma_out_wifi_hdr {
         __le32 cmd;
         __le32 meta_data;
-} __attribute__ ((packed));
+} __packed;
 
 /* Sequence numbering */
 #define UMAC_WIFI_SEQ_NUM_BASE          1
@@ -408,12 +408,12 @@ struct iwm_rx_ticket {
         __le16 flags;
         u8 payload_offset; /* includes: MAC header, pad, IV */
         u8 tail_len; /* includes: MIC, ICV, CRC (w/o STATUS) */
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_rx_mpdu_hdr {
         __le16 len;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /* UMAC SW WIFI API */
 
@@ -421,31 +421,31 @@ struct iwm_dev_cmd_hdr {
         u8 cmd;
         u8 flags;
         __le16 seq_num;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_fw_cmd_hdr {
         __le32 meta_data;
         struct iwm_dev_cmd_hdr cmd;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_wifi_out_hdr {
         struct iwm_udma_out_wifi_hdr hw_hdr;
         struct iwm_umac_fw_cmd_hdr sw_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_nonwifi_out_hdr {
         struct iwm_udma_out_nonwifi_hdr hw_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_wifi_in_hdr {
         struct iwm_udma_in_hdr hw_hdr;
         struct iwm_umac_fw_cmd_hdr sw_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_nonwifi_in_hdr {
         struct iwm_udma_in_hdr hw_hdr;
         __le32 time_stamp;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_UMAC_PAGE_SIZE      0x200
 
@@ -521,7 +521,7 @@ struct iwm_umac_notif_wifi_if {
         u8 status;
         u8 flags;
         __le16 buf_size;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_ROAM_REASON_FIRST_SELECTION        0x1
 #define UMAC_ROAM_REASON_AP_DEAUTH              0x2
@@ -535,7 +535,7 @@ struct iwm_umac_notif_assoc_start {
         __le32 roam_reason;
         u8 bssid[ETH_ALEN];
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_ASSOC_COMPLETE_SUCCESS             0x0
 #define UMAC_ASSOC_COMPLETE_FAILURE             0x1
@@ -546,7 +546,7 @@ struct iwm_umac_notif_assoc_complete {
         u8 bssid[ETH_ALEN];
         u8 band;
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_PROFILE_INVALID_ASSOC_TIMEOUT      0x0
 #define UMAC_PROFILE_INVALID_ROAM_TIMEOUT       0x1
@@ -556,7 +556,7 @@ struct iwm_umac_notif_assoc_complete {
 struct iwm_umac_notif_profile_invalidate {
         struct iwm_umac_notif_wifi_if mlme_hdr;
         __le32 reason;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_SCAN_RESULT_SUCCESS  0x0
 #define UMAC_SCAN_RESULT_ABORTED  0x1
@@ -568,7 +568,7 @@ struct iwm_umac_notif_scan_complete {
         __le32 type;
         __le32 result;
         u8 seq_num;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_OPCODE_ADD_MODIFY  0x0
 #define UMAC_OPCODE_REMOVE      0x1
@@ -582,7 +582,7 @@ struct iwm_umac_notif_sta_info {
         u8 mac_addr[ETH_ALEN];
         u8 sta_id; /* bits 0-3: station ID, bits 4-7: station color */
         u8 flags;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_BAND_2GHZ 0
 #define UMAC_BAND_5GHZ 1
@@ -601,7 +601,7 @@ struct iwm_umac_notif_bss_info {
         s8 rssi;
         u8 reserved;
         u8 frame_buf[1];
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_BSS_REMOVE_INDEX_MSK           0x0fff
 #define IWM_BSS_REMOVE_FLAGS_MSK           0xfc00
@@ -614,13 +614,13 @@ struct iwm_umac_notif_bss_removed {
         struct iwm_umac_notif_wifi_if mlme_hdr;
         __le32 count;
         __le16 entries[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_mgt_frame {
         struct iwm_umac_notif_wifi_if mlme_hdr;
         __le16 len;
         u8 frame[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_alive {
         struct iwm_umac_wifi_in_hdr hdr;
@@ -630,13 +630,13 @@ struct iwm_umac_notif_alive {
         __le16 reserved2;
         __le16 page_grp_count;
         __le32 page_grp_state[IWM_MACS_OUT_GROUPS];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_init_complete {
         struct iwm_umac_wifi_in_hdr hdr;
         __le16 status;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /* error categories */
 enum {
@@ -667,12 +667,12 @@ struct iwm_fw_error_hdr {
         __le32 dbm_buf_end;
         __le32 dbm_buf_write_ptr;
         __le32 dbm_buf_cycle_cnt;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_error {
         struct iwm_umac_wifi_in_hdr hdr;
         struct iwm_fw_error_hdr err;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_DEALLOC_NTFY_CHANGES_CNT_POS       0
 #define UMAC_DEALLOC_NTFY_CHANGES_CNT_SEED      0xff
@@ -687,20 +687,20 @@ struct iwm_umac_notif_page_dealloc {
         struct iwm_umac_wifi_in_hdr hdr;
         __le32 changes;
         __le32 grp_info[IWM_MACS_OUT_GROUPS];
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_wifi_status {
         struct iwm_umac_wifi_in_hdr hdr;
         __le16 status;
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct iwm_umac_notif_rx_ticket {
         struct iwm_umac_wifi_in_hdr hdr;
         u8 num_tickets;
         u8 reserved[3];
         struct iwm_rx_ticket tickets[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* Tx/Rx rates window (number of max of last update window per second) */
 #define UMAC_NTF_RATE_SAMPLE_NR 4
@@ -758,7 +758,7 @@ struct iwm_umac_notif_stats {
         __le32 roam_unassoc;
         __le32 roam_deauth;
         __le32 roam_ap_loadblance;
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_STOP_TX_FLAG    0x1
 #define UMAC_RESUME_TX_FLAG  0x2
@@ -770,7 +770,7 @@ struct iwm_umac_notif_stop_resume_tx {
         u8 flags; /* UMAC_*_TX_FLAG_* */
         u8 sta_id;
         __le16 stop_resume_tid_msk; /* tid bitmask */
-} __attribute__ ((packed));
+} __packed;
 
 #define UMAC_MAX_NUM_PMKIDS 4
 
@@ -779,7 +779,7 @@ struct iwm_umac_wifi_if {
         u8 oid;
         u8 flags;
         __le16 buf_size;
-} __attribute__ ((packed));
+} __packed;
 
 #define IWM_SEQ_NUM_HOST_MSK    0x0000
 #define IWM_SEQ_NUM_UMAC_MSK    0x4000
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 3809c0b4946..3bd5d3b6037 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -326,7 +326,7 @@ struct txpd {
         u8 pktdelay_2ms;
         /* reserved */
         u8 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 /* RxPD Descriptor */
 struct rxpd {
@@ -339,8 +339,8 @@ struct rxpd {
                         u8 bss_type;
                         /* BSS number */
                         u8 bss_num;
-                } __attribute__ ((packed)) bss;
-        } __attribute__ ((packed)) u;
+                } __packed bss;
+        } __packed u;
 
         /* SNR */
         u8 snr;
@@ -366,14 +366,14 @@ struct rxpd {
         /* Pkt Priority */
         u8 priority;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_header {
         __le16 command;
         __le16 size;
         __le16 seqnum;
         __le16 result;
-} __attribute__ ((packed));
+} __packed;
 
 /* Generic structure to hold all key types. */
 struct enc_key {
@@ -387,7 +387,7 @@ struct enc_key {
 struct lbs_offset_value {
         u32 offset;
         u32 value;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Define data structure for CMD_GET_HW_SPEC
@@ -426,7 +426,7 @@ struct cmd_ds_get_hw_spec {
 
         /*FW/HW capability */
         __le32 fwcapinfo;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_subscribe_event {
         struct cmd_header hdr;
@@ -440,7 +440,7 @@ struct cmd_ds_802_11_subscribe_event {
          * bump this up a bit.
          */
         uint8_t tlv[128];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * This scan handle Country Information IE(802.11d compliant)
@@ -452,7 +452,7 @@ struct cmd_ds_802_11_scan {
         uint8_t bsstype;
         uint8_t bssid[ETH_ALEN];
         uint8_t tlvbuffer[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_scan_rsp {
         struct cmd_header hdr;
@@ -460,7 +460,7 @@ struct cmd_ds_802_11_scan_rsp {
         __le16 bssdescriptsize;
         uint8_t nr_sets;
         uint8_t bssdesc_and_tlvbuffer[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_get_log {
         struct cmd_header hdr;
@@ -478,20 +478,20 @@ struct cmd_ds_802_11_get_log {
         __le32 fcserror;
         __le32 txframe;
         __le32 wepundecryptable;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_control {
         struct cmd_header hdr;
         __le16 action;
         u16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_multicast_adr {
         struct cmd_header hdr;
         __le16 action;
         __le16 nr_of_adrs;
         u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_authenticate {
         struct cmd_header hdr;
@@ -499,14 +499,14 @@ struct cmd_ds_802_11_authenticate {
         u8 bssid[ETH_ALEN];
         u8 authtype;
         u8 reserved[10];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_deauthenticate {
         struct cmd_header hdr;
 
         u8 macaddr[ETH_ALEN];
         __le16 reasoncode;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_associate {
         struct cmd_header hdr;
@@ -517,7 +517,7 @@ struct cmd_ds_802_11_associate {
         __le16 bcnperiod;
         u8 dtimperiod;
         u8 iebuf[512];    /* Enough for required and most optional IEs */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_associate_response {
         struct cmd_header hdr;
@@ -526,7 +526,7 @@ struct cmd_ds_802_11_associate_response {
         __le16 statuscode;
         __le16 aid;
         u8 iebuf[512];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_set_wep {
         struct cmd_header hdr;
@@ -540,7 +540,7 @@ struct cmd_ds_802_11_set_wep {
         /* 40, 128bit or TXWEP */
         uint8_t keytype[4];
         uint8_t keymaterial[4][16];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_snmp_mib {
         struct cmd_header hdr;
@@ -549,40 +549,40 @@ struct cmd_ds_802_11_snmp_mib {
         __le16 oid;
         __le16 bufsize;
         u8 value[128];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_reg_access {
         __le16 action;
         __le16 offset;
         __le32 value;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_bbp_reg_access {
         __le16 action;
         __le16 offset;
         u8 value;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_rf_reg_access {
         __le16 action;
         __le16 offset;
         u8 value;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_radio_control {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 control;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_beacon_control {
         __le16 action;
         __le16 beacon_enable;
         __le16 beacon_period;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_sleep_params {
         struct cmd_header hdr;
@@ -607,7 +607,7 @@ struct cmd_ds_802_11_sleep_params {
 
         /* reserved field, should be set to zero */
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rf_channel {
         struct cmd_header hdr;
@@ -617,7 +617,7 @@ struct cmd_ds_802_11_rf_channel {
         __le16 rftype;      /* unused */
         __le16 reserved;    /* unused */
         u8 channellist[32]; /* unused */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rssi {
         /* weighting factor */
@@ -626,21 +626,21 @@ struct cmd_ds_802_11_rssi {
         __le16 reserved_0;
         __le16 reserved_1;
         __le16 reserved_2;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rssi_rsp {
         __le16 SNR;
         __le16 noisefloor;
         __le16 avgSNR;
         __le16 avgnoisefloor;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_mac_address {
         struct cmd_header hdr;
 
         __le16 action;
         u8 macadd[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rf_tx_power {
         struct cmd_header hdr;
@@ -649,26 +649,26 @@ struct cmd_ds_802_11_rf_tx_power {
         __le16 curlevel;
         s8 maxlevel;
         s8 minlevel;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_monitor_mode {
         __le16 action;
         __le16 mode;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_set_boot2_ver {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 version;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_fw_wake_method {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 method;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ps_mode {
         __le16 action;
@@ -676,7 +676,7 @@ struct cmd_ds_802_11_ps_mode {
         __le16 multipledtim;
         __le16 reserved;
         __le16 locallisteninterval;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_confirm_sleep {
         struct cmd_header hdr;
@@ -686,7 +686,7 @@ struct cmd_confirm_sleep {
         __le16 multipledtim;
         __le16 reserved;
         __le16 locallisteninterval;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_data_rate {
         struct cmd_header hdr;
@@ -694,14 +694,14 @@ struct cmd_ds_802_11_data_rate {
         __le16 action;
         __le16 reserved;
         u8 rates[MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rate_adapt_rateset {
         struct cmd_header hdr;
         __le16 action;
         __le16 enablehwauto;
         __le16 bitmap;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_start {
         struct cmd_header hdr;
@@ -718,14 +718,14 @@ struct cmd_ds_802_11_ad_hoc_start {
         __le16 capability;
         u8 rates[MAX_RATES];
         u8 tlv_memory_size_pad[100];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_result {
         struct cmd_header hdr;
 
         u8 pad[3];
         u8 bssid[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct adhoc_bssdesc {
         u8 bssid[ETH_ALEN];
@@ -746,7 +746,7 @@ struct adhoc_bssdesc {
          * Adhoc join command and will cause a binary layout mismatch with
          * the firmware
          */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_join {
         struct cmd_header hdr;
@@ -754,18 +754,18 @@ struct cmd_ds_802_11_ad_hoc_join {
         struct adhoc_bssdesc bss;
         __le16 failtimeout;   /* Reserved on v9 and later */
         __le16 probedelay;    /* Reserved on v9 and later */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_stop {
         struct cmd_header hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_enable_rsn {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 enable;
-} __attribute__ ((packed));
+} __packed;
 
 struct MrvlIEtype_keyParamSet {
         /* type ID */
@@ -785,7 +785,7 @@ struct MrvlIEtype_keyParamSet {
 
         /* key material of size keylen */
         u8 key[32];
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_WOL_RULES           16
 
@@ -797,7 +797,7 @@ struct host_wol_rule {
         __le16 reserve;
         __be32 sig_mask;
         __be32 signature;
-} __attribute__ ((packed));
+} __packed;
 
 struct wol_config {
         uint8_t action;
@@ -805,7 +805,7 @@ struct wol_config {
         uint8_t no_rules_in_cmd;
         uint8_t result;
         struct host_wol_rule rule[MAX_WOL_RULES];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_host_sleep {
         struct cmd_header hdr;
@@ -813,7 +813,7 @@ struct cmd_ds_host_sleep {
         uint8_t gpio;
         uint16_t gap;
         struct wol_config wol_conf;
-} __attribute__ ((packed));
+} __packed;
 
 
 
@@ -822,7 +822,7 @@ struct cmd_ds_802_11_key_material {
 
         __le16 action;
         struct MrvlIEtype_keyParamSet keyParamSet[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_eeprom_access {
         struct cmd_header hdr;
@@ -832,7 +832,7 @@ struct cmd_ds_802_11_eeprom_access {
         /* firmware says it returns a maximum of 20 bytes */
 #define LBS_EEPROM_READ_LEN 20
         u8 value[LBS_EEPROM_READ_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_tpc_cfg {
         struct cmd_header hdr;
@@ -843,7 +843,7 @@ struct cmd_ds_802_11_tpc_cfg {
         int8_t P1;
         int8_t P2;
         uint8_t usesnr;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct cmd_ds_802_11_pa_cfg {
@@ -854,14 +854,14 @@ struct cmd_ds_802_11_pa_cfg {
         int8_t P0;
         int8_t P1;
         int8_t P2;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct cmd_ds_802_11_led_ctrl {
         __le16 action;
         __le16 numled;
         u8 data[256];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_afc {
         __le16 afc_auto;
@@ -875,22 +875,22 @@ struct cmd_ds_802_11_afc {
                         __le16 carrier_offset; /* signed */
                 };
         };
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_tx_rate_query {
         __le16 txrate;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_get_tsf {
         __le64 tsfvalue;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_bt_access {
         __le16 action;
         __le32 id;
         u8 addr1[ETH_ALEN];
         u8 addr2[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_fwt_access {
         __le16 action;
@@ -910,7 +910,7 @@ struct cmd_ds_fwt_access {
         __le32 snr;
         __le32 references;
         u8 prec[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mesh_config {
         struct cmd_header hdr;
@@ -920,14 +920,14 @@ struct cmd_ds_mesh_config {
         __le16 type;
         __le16 length;
         u8 data[128];   /* last position reserved */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mesh_access {
         struct cmd_header hdr;
 
         __le16 action;
         __le32 data[32];        /* last position reserved */
-} __attribute__ ((packed));
+} __packed;
 
 /* Number of stats counters returned by the firmware */
 #define MESH_STATS_NUM 8
@@ -957,6 +957,6 @@ struct cmd_ds_command {
                 struct cmd_ds_fwt_access fwt;
                 struct cmd_ds_802_11_beacon_control bcn_ctrl;
         } params;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/libertas/radiotap.h
index d16b26416e8..b3c8ea6d610 100644
--- a/drivers/net/wireless/libertas/radiotap.h
+++ b/drivers/net/wireless/libertas/radiotap.h
@@ -6,7 +6,7 @@ struct tx_radiotap_hdr {
         u8 txpower;
         u8 rts_retries;
         u8 data_retries;
-} __attribute__ ((packed));
+} __packed;
 
 #define TX_RADIOTAP_PRESENT (                           \
         (1 << IEEE80211_RADIOTAP_RATE) |                \
@@ -34,7 +34,7 @@ struct rx_radiotap_hdr {
         u8 flags;
         u8 rate;
         u8 antsignal;
-} __attribute__ ((packed));
+} __packed;
 
 #define RX_RADIOTAP_PRESENT (                   \
         (1 << IEEE80211_RADIOTAP_FLAGS) |       \
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 7a377f5b766..1c63f8ce734 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -15,7 +15,7 @@ struct eth803hdr {
         u8 dest_addr[6];
         u8 src_addr[6];
         u16 h803_len;
-} __attribute__ ((packed));
+} __packed;
 
 struct rfc1042hdr {
         u8 llc_dsap;
@@ -23,17 +23,17 @@ struct rfc1042hdr {
         u8 llc_ctrl;
         u8 snap_oui[3];
         u16 snap_type;
-} __attribute__ ((packed));
+} __packed;
 
 struct rxpackethdr {
         struct eth803hdr eth803_hdr;
         struct rfc1042hdr rfc1042_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct rx80211packethdr {
         struct rxpd rx_pd;
         void *eth80211_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 static int process_rxed_802_11_packet(struct lbs_private *priv,
         struct sk_buff *skb);
diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/libertas/types.h
index 3e72c86ceca..462fbb4cb74 100644
--- a/drivers/net/wireless/libertas/types.h
+++ b/drivers/net/wireless/libertas/types.h
@@ -11,7 +11,7 @@
 struct ieee_ie_header {
         u8 id;
         u8 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_cf_param_set {
         struct ieee_ie_header header;
@@ -20,19 +20,19 @@ struct ieee_ie_cf_param_set {
         u8 cfpperiod;
         __le16 cfpmaxduration;
         __le16 cfpdurationremaining;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct ieee_ie_ibss_param_set {
         struct ieee_ie_header header;
 
         __le16 atimwindow;
-} __attribute__ ((packed));
+} __packed;
 
 union ieee_ss_param_set {
         struct ieee_ie_cf_param_set cf;
         struct ieee_ie_ibss_param_set ibss;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_fh_param_set {
         struct ieee_ie_header header;
@@ -41,18 +41,18 @@ struct ieee_ie_fh_param_set {
         u8 hopset;
         u8 hoppattern;
         u8 hopindex;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_ds_param_set {
         struct ieee_ie_header header;
 
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 union ieee_phy_param_set {
         struct ieee_ie_fh_param_set fh;
         struct ieee_ie_ds_param_set ds;
-} __attribute__ ((packed));
+} __packed;
 
 /** TLV  type ID definition */
 #define PROPRIETARY_TLV_BASE_ID         0x0100
@@ -100,28 +100,28 @@ union ieee_phy_param_set {
 struct mrvl_ie_header {
         __le16 type;
         __le16 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_data {
         struct mrvl_ie_header header;
         u8 Data[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_rates_param_set {
         struct mrvl_ie_header header;
         u8 rates[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ssid_param_set {
         struct mrvl_ie_header header;
         u8 ssid[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_wildcard_ssid_param_set {
         struct mrvl_ie_header header;
         u8 MaxSsidlength;
         u8 ssid[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct chanscanmode {
 #ifdef __BIG_ENDIAN_BITFIELD
@@ -133,7 +133,7 @@ struct chanscanmode {
         u8 disablechanfilt:1;
         u8 reserved_2_7:6;
 #endif
-} __attribute__ ((packed));
+} __packed;
 
 struct chanscanparamset {
         u8 radiotype;
@@ -141,12 +141,12 @@ struct chanscanparamset {
         struct chanscanmode chanscanmode;
         __le16 minscantime;
         __le16 maxscantime;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_chanlist_param_set {
         struct mrvl_ie_header header;
         struct chanscanparamset chanscanparam[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_cf_param_set {
         struct mrvl_ie_header header;
@@ -154,86 +154,86 @@ struct mrvl_ie_cf_param_set {
         u8 cfpperiod;
         __le16 cfpmaxduration;
         __le16 cfpdurationremaining;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ds_param_set {
         struct mrvl_ie_header header;
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_rsn_param_set {
         struct mrvl_ie_header header;
         u8 rsnie[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_tsf_timestamp {
         struct mrvl_ie_header header;
         __le64 tsftable[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* v9 and later firmware only */
 struct mrvl_ie_auth_type {
         struct mrvl_ie_header header;
         __le16 auth;
-} __attribute__ ((packed));
+} __packed;
 
 /**  Local Power capability */
 struct mrvl_ie_power_capability {
         struct mrvl_ie_header header;
         s8 minpower;
         s8 maxpower;
-} __attribute__ ((packed));
+} __packed;
 
 /* used in CMD_802_11_SUBSCRIBE_EVENT for SNR, RSSI and Failure */
 struct mrvl_ie_thresholds {
         struct mrvl_ie_header header;
         u8 value;
         u8 freq;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_beacons_missed {
         struct mrvl_ie_header header;
         u8 beaconmissed;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_num_probes {
         struct mrvl_ie_header header;
         __le16 numprobes;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_bcast_probe {
         struct mrvl_ie_header header;
         __le16 bcastprobe;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_num_ssid_probe {
         struct mrvl_ie_header header;
         __le16 numssidprobe;
-} __attribute__ ((packed));
+} __packed;
 
 struct led_pin {
         u8 led;
         u8 pin;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ledgpio {
         struct mrvl_ie_header header;
         struct led_pin ledpin[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct led_bhv {
         uint8_t firmwarestate;
         uint8_t led;
         uint8_t ledstate;
         uint8_t ledarg;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct mrvl_ie_ledbhv {
         struct mrvl_ie_header header;
         struct led_bhv ledbhv[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* Meant to be packed as the value member of a struct ieee80211_info_element.
  * Note that the len member of the ieee80211_info_element varies depending on
@@ -248,12 +248,12 @@ struct mrvl_meshie_val {
         uint8_t mesh_capability;
         uint8_t mesh_id_len;
         uint8_t mesh_id[IEEE80211_MAX_SSID_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_meshie {
         u8 id, len;
         struct mrvl_meshie_val val;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_mesh_defaults {
         __le32 bootflag;
@@ -261,6 +261,6 @@ struct mrvl_mesh_defaults {
         uint8_t reserved;
         __le16 channel;
         struct mrvl_meshie meshie;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/libertas_tf/libertas_tf.h b/drivers/net/wireless/libertas_tf/libertas_tf.h
index fbbaaae7a1a..737eac92ef7 100644
--- a/drivers/net/wireless/libertas_tf/libertas_tf.h
+++ b/drivers/net/wireless/libertas_tf/libertas_tf.h
@@ -316,7 +316,7 @@ struct cmd_header {
         __le16 size;
         __le16 seqnum;
         __le16 result;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ctrl_node {
         struct list_head list;
@@ -369,7 +369,7 @@ struct cmd_ds_get_hw_spec {
 
         /*FW/HW capability */
         __le32 fwcapinfo;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_control {
         struct cmd_header hdr;
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 6f8cb3ee6fe..49a7dfb4809 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -317,7 +317,7 @@ struct hwsim_radiotap_hdr {
         u8 rt_rate;
         __le16 rt_channel;
         __le16 rt_chbitmask;
-} __attribute__ ((packed));
+} __packed;
 
 
 static netdev_tx_t hwsim_mon_xmit(struct sk_buff *skb,
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index cd37b2ac535..c019fdc131c 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -426,7 +426,7 @@ struct mwl8k_cmd_pkt {
         __u8    macid;
         __le16  result;
         char    payload[0];
-} __attribute__((packed));
+} __packed;
 
 /*
  * Firmware loading.
@@ -632,7 +632,7 @@ struct mwl8k_dma_data {
         __le16 fwlen;
         struct ieee80211_hdr wh;
         char data[0];
-} __attribute__((packed));
+} __packed;
 
 /* Routines to add/remove DMA header from skb.  */
 static inline void mwl8k_remove_dma_header(struct sk_buff *skb, __le16 qos)
@@ -711,7 +711,7 @@ struct mwl8k_rxd_8366_ap {
         __u8 rx_status;
         __u8 channel;
         __u8 rx_ctrl;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_8366_AP_RATE_INFO_MCS_FORMAT      0x80
 #define MWL8K_8366_AP_RATE_INFO_40MHZ           0x40
@@ -806,7 +806,7 @@ struct mwl8k_rxd_sta {
         __u8 rx_ctrl;
         __u8 rx_status;
         __u8 pad2[2];
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_RATE_INFO_SHORTPRE            0x8000
 #define MWL8K_STA_RATE_INFO_ANTSELECT(x)        (((x) >> 11) & 0x3)
@@ -1120,7 +1120,7 @@ struct mwl8k_tx_desc {
         __le16 rate_info;
         __u8 peer_id;
         __u8 tx_frag_cnt;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_TX_DESCS          128
 
@@ -1666,7 +1666,7 @@ struct mwl8k_cmd_get_hw_spec_sta {
         __le32 caps2;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_CAP_MAX_AMSDU             0x20000000
 #define MWL8K_CAP_GREENFIELD            0x08000000
@@ -1810,7 +1810,7 @@ struct mwl8k_cmd_get_hw_spec_ap {
         __le32 wcbbase1;
         __le32 wcbbase2;
         __le32 wcbbase3;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
 {
@@ -1883,7 +1883,7 @@ struct mwl8k_cmd_set_hw_spec {
         __le32 flags;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT           0x00000080
 #define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP       0x00000020
@@ -1985,7 +1985,7 @@ __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
 struct mwl8k_cmd_get_stat {
         struct mwl8k_cmd_pkt header;
         __le32 stats[64];
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STAT_ACK_FAILURE  9
 #define MWL8K_STAT_RTS_FAILURE  12
@@ -2029,7 +2029,7 @@ struct mwl8k_cmd_radio_control {
         __le16 action;
         __le16 control;
         __le16 radio_on;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_radio_control(struct ieee80211_hw *hw, bool enable, bool force)
@@ -2092,7 +2092,7 @@ struct mwl8k_cmd_rf_tx_power {
         __le16 current_level;
         __le16 reserved;
         __le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)
 {
@@ -2121,7 +2121,7 @@ struct mwl8k_cmd_rf_antenna {
         struct mwl8k_cmd_pkt header;
         __le16 antenna;
         __le16 mode;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_RF_ANTENNA_RX             1
 #define MWL8K_RF_ANTENNA_TX             2
@@ -2182,7 +2182,7 @@ static int mwl8k_cmd_set_beacon(struct ieee80211_hw *hw,
  */
 struct mwl8k_cmd_set_pre_scan {
         struct mwl8k_cmd_pkt header;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_pre_scan(struct ieee80211_hw *hw)
 {
@@ -2209,7 +2209,7 @@ struct mwl8k_cmd_set_post_scan {
         struct mwl8k_cmd_pkt header;
         __le32 isibss;
         __u8 bssid[ETH_ALEN];
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_post_scan(struct ieee80211_hw *hw, const __u8 *mac)
@@ -2240,7 +2240,7 @@ struct mwl8k_cmd_set_rf_channel {
         __le16 action;
         __u8 current_channel;
         __le32 channel_flags;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
                                     struct ieee80211_conf *conf)
@@ -2293,7 +2293,7 @@ struct mwl8k_cmd_update_set_aid {
         __u8    bssid[ETH_ALEN];
         __le16  protection_mode;
         __u8    supp_rates[14];
-} __attribute__((packed));
+} __packed;
 
 static void legacy_rate_mask_to_array(u8 *rates, u32 mask)
 {
@@ -2364,7 +2364,7 @@ struct mwl8k_cmd_set_rate {
         /* Bitmap for supported MCS codes.  */
         __u8    mcs_set[16];
         __u8    reserved[16];
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_rate(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -2397,7 +2397,7 @@ struct mwl8k_cmd_finalize_join {
         struct mwl8k_cmd_pkt header;
         __le32 sleep_interval;  /* Number of beacon periods to sleep */
         __u8 beacon_data[MWL8K_FJ_BEACON_MAXLEN];
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_finalize_join(struct ieee80211_hw *hw, void *frame,
                                    int framelen, int dtim)
@@ -2436,7 +2436,7 @@ struct mwl8k_cmd_set_rts_threshold {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __le16 threshold;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_rts_threshold(struct ieee80211_hw *hw, int rts_thresh)
@@ -2466,7 +2466,7 @@ struct mwl8k_cmd_set_slot {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __u8 short_slot;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_slot(struct ieee80211_hw *hw, bool short_slot_time)
 {
@@ -2528,7 +2528,7 @@ struct mwl8k_cmd_set_edca_params {
                         __u8 txq;
                 } sta;
         };
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_SET_EDCA_CW       0x01
 #define MWL8K_SET_EDCA_TXOP     0x02
@@ -2579,7 +2579,7 @@ mwl8k_cmd_set_edca_params(struct ieee80211_hw *hw, __u8 qnum,
 struct mwl8k_cmd_set_wmm_mode {
         struct mwl8k_cmd_pkt header;
         __le16 action;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_wmm_mode(struct ieee80211_hw *hw, bool enable)
 {
@@ -2612,7 +2612,7 @@ struct mwl8k_cmd_mimo_config {
         __le32 action;
         __u8 rx_antenna_map;
         __u8 tx_antenna_map;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_mimo_config(struct ieee80211_hw *hw, __u8 rx, __u8 tx)
 {
@@ -2652,7 +2652,7 @@ struct mwl8k_cmd_use_fixed_rate_sta {
         __le32 rate_type;
         __le32 reserved1;
         __le32 reserved2;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_USE_AUTO_RATE     0x0002
 #define MWL8K_UCAST_RATE        0
@@ -2694,7 +2694,7 @@ struct mwl8k_cmd_use_fixed_rate_ap {
         u8 multicast_rate;
         u8 multicast_rate_type;
         u8 management_rate;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)
@@ -2724,7 +2724,7 @@ mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)
 struct mwl8k_cmd_enable_sniffer {
         struct mwl8k_cmd_pkt header;
         __le32 action;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_enable_sniffer(struct ieee80211_hw *hw, bool enable)
 {
@@ -2757,7 +2757,7 @@ struct mwl8k_cmd_set_mac_addr {
                 } mbss;
                 __u8 mac_addr[ETH_ALEN];
         };
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_MAC_TYPE_PRIMARY_CLIENT           0
 #define MWL8K_MAC_TYPE_SECONDARY_CLIENT         1
@@ -2812,7 +2812,7 @@ struct mwl8k_cmd_set_rate_adapt_mode {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __le16 mode;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
 {
@@ -2840,7 +2840,7 @@ static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
 struct mwl8k_cmd_bss_start {
         struct mwl8k_cmd_pkt header;
         __le32 enable;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_bss_start(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif, int enable)
@@ -2885,7 +2885,7 @@ struct mwl8k_cmd_set_new_stn {
         __u8 add_qos_info;
         __u8 is_qos_sta;
         __le32 fw_sta_ptr;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_ACTION_ADD            0
 #define MWL8K_STA_ACTION_REMOVE         2
@@ -2978,7 +2978,7 @@ struct ewc_ht_info {
         __le16  control1;
         __le16  control2;
         __le16  control3;
-} __attribute__((packed));
+} __packed;
 
 struct peer_capability_info {
         /* Peer type - AP vs. STA.  */
@@ -3007,7 +3007,7 @@ struct peer_capability_info {
         __u8    pad2;
         __u8    station_id;
         __le16  amsdu_enabled;
-} __attribute__((packed));
+} __packed;
 
 struct mwl8k_cmd_update_stadb {
         struct mwl8k_cmd_pkt header;
@@ -3022,7 +3022,7 @@ struct mwl8k_cmd_update_stadb {
 
         /* Peer info - valid during add/update.  */
         struct peer_capability_info     peer_info;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_DB_MODIFY_ENTRY       1
 #define MWL8K_STA_DB_DEL_ENTRY          2
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 3e1947d097c..259d7585398 100644
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -49,7 +49,7 @@ struct orinoco_fw_header {
         __le32 pri_offset;      /* Offset to primary plug data */
         __le32 compat_offset;   /* Offset to compatibility data*/
         char signature[0];      /* FW signature length headersize-20 */
-} __attribute__ ((packed));
+} __packed;
 
 /* Check the range of various header entries. Return a pointer to a
  * description of the problem, or NULL if everything checks out. */
diff --git a/drivers/net/wireless/orinoco/hermes.h b/drivers/net/wireless/orinoco/hermes.h
index 9ca34e722b4..d9f18c11682 100644
--- a/drivers/net/wireless/orinoco/hermes.h
+++ b/drivers/net/wireless/orinoco/hermes.h
@@ -205,7 +205,7 @@ struct hermes_tx_descriptor {
         u8 retry_count;
         u8 tx_rate;
         __le16 tx_control;
-} __attribute__ ((packed));
+} __packed;
 
 #define HERMES_TXSTAT_RETRYERR          (0x0001)
 #define HERMES_TXSTAT_AGEDERR           (0x0002)
@@ -254,7 +254,7 @@ struct hermes_tallies_frame {
         /* Those last are probably not available in very old firmwares */
         __le16 RxDiscards_WEPICVError;
         __le16 RxDiscards_WEPExcluded;
-} __attribute__ ((packed));
+} __packed;
 
 /* Grabbed from wlan-ng - Thanks Mark... - Jean II
  * This is the result of a scan inquiry command */
@@ -271,7 +271,7 @@ struct prism2_scan_apinfo {
         u8 rates[10];           /* Bit rate supported */
         __le16 proberesp_rate;  /* Data rate of the response frame */
         __le16 atim;            /* ATIM window time, Kus (hostscan only) */
-} __attribute__ ((packed));
+} __packed;
 
 /* Same stuff for the Lucent/Agere card.
  * Thanks to h1kari <h1kari AT dachb0den.com> - Jean II */
@@ -285,7 +285,7 @@ struct agere_scan_apinfo {
         /* bits: 0-ess, 1-ibss, 4-privacy [wep] */
         __le16 essid_len;       /* ESSID length */
         u8 essid[32];           /* ESSID of the network */
-} __attribute__ ((packed));
+} __packed;
 
 /* Moustafa: Scan structure for Symbol cards */
 struct symbol_scan_apinfo {
@@ -303,7 +303,7 @@ struct symbol_scan_apinfo {
         __le16 basic_rates;     /* Basic rates bitmask */
         u8 unknown2[6];         /* Always FF:FF:FF:FF:00:00 */
         u8 unknown3[8];         /* Always 0, appeared in f/w 3.91-68 */
-} __attribute__ ((packed));
+} __packed;
 
 union hermes_scan_info {
         struct agere_scan_apinfo        a;
@@ -343,7 +343,7 @@ struct agere_ext_scan_info {
         __le16  beacon_interval;
         __le16  capabilities;
         u8      data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define HERMES_LINKSTATUS_NOT_CONNECTED   (0x0000)
 #define HERMES_LINKSTATUS_CONNECTED       (0x0001)
@@ -355,7 +355,7 @@ struct agere_ext_scan_info {
 
 struct hermes_linkstatus {
         __le16 linkstatus;         /* Link status */
-} __attribute__ ((packed));
+} __packed;
 
 struct hermes_response {
         u16 status, resp0, resp1, resp2;
@@ -365,11 +365,11 @@ struct hermes_response {
 struct hermes_idstring {
         __le16 len;
         __le16 val[16];
-} __attribute__ ((packed));
+} __packed;
 
 struct hermes_multicast {
         u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* Timeouts */
 #define HERMES_BAP_BUSY_TIMEOUT (10000) /* In iterations of ~1us */
diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/orinoco/hermes_dld.c
index f750f49bbd4..2b2b9a1a979 100644
--- a/drivers/net/wireless/orinoco/hermes_dld.c
+++ b/drivers/net/wireless/orinoco/hermes_dld.c
@@ -65,7 +65,7 @@ struct dblock {
         __le32 addr;            /* adapter address where to write the block */
         __le16 len;             /* length of the data only, in bytes */
         char data[0];           /* data to be written */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Plug Data References are located in the image after the last data
@@ -77,7 +77,7 @@ struct pdr {
         __le32 addr;            /* adapter address where to write the data */
         __le32 len;             /* expected length of the data, in bytes */
         char next[0];           /* next PDR starts here */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Plug Data Items are located in the EEPROM read from the adapter by
@@ -88,7 +88,7 @@ struct pdi {
         __le16 len;             /* length of ID and data, in words */
         __le16 id;              /* record ID */
         char data[0];           /* plug data */
-} __attribute__ ((packed));
+} __packed;
 
 /*** FW data block access functions ***/
 
@@ -317,7 +317,7 @@ static const struct {							\
         __le16 len;                                                     \
         __le16 id;                                                      \
         u8 val[length];                                                 \
-} __attribute__ ((packed)) default_pdr_data_##pid = {                   \
+} __packed default_pdr_data_##pid = {                   \
         cpu_to_le16((sizeof(default_pdr_data_##pid)/                    \
                                 sizeof(__le16)) - 1),                   \
         cpu_to_le16(pid),                                               \
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index 6fbd7885012..077baa86756 100644
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -45,7 +45,7 @@ static const struct {
 /* Firmware version encoding */
 struct comp_id {
         u16 id, variant, major, minor;
-} __attribute__ ((packed));
+} __packed;
 
 static inline fwtype_t determine_firmware_type(struct comp_id *nic_id)
 {
@@ -995,7 +995,7 @@ int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
                 u8 tx_mic[MIC_KEYLEN];
                 u8 rx_mic[MIC_KEYLEN];
                 u8 tsc[ORINOCO_SEQ_LEN];
-        } __attribute__ ((packed)) buf;
+        } __packed buf;
         hermes_t *hw = &priv->hw;
         int ret;
         int err;
@@ -1326,7 +1326,7 @@ int orinoco_hw_disassociate(struct orinoco_private *priv,
         struct {
                 u8 addr[ETH_ALEN];
                 __le16 reason_code;
-        } __attribute__ ((packed)) buf;
+        } __packed buf;
 
         /* Currently only supported by WPA enabled Agere fw */
         if (!priv->has_wpa)
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index ca71f08709b..e8e2d0f4763 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -172,7 +172,7 @@ struct hermes_txexc_data {
         __le16 frame_ctl;
         __le16 duration_id;
         u8 addr1[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 /* Rx frame header except compatibility 802.3 header */
 struct hermes_rx_descriptor {
@@ -196,7 +196,7 @@ struct hermes_rx_descriptor {
 
         /* Data length */
         __le16 data_len;
-} __attribute__ ((packed));
+} __packed;
 
 struct orinoco_rx_data {
         struct hermes_rx_descriptor *desc;
@@ -390,7 +390,7 @@ int orinoco_process_xmit_skb(struct sk_buff *skb,
                 struct header_struct {
                         struct ethhdr eth;      /* 802.3 header */
                         u8 encap[6];            /* 802.2 header */
-                } __attribute__ ((packed)) hdr;
+                } __packed hdr;
                 int len = skb->len + sizeof(encaps_hdr) - (2 * ETH_ALEN);
 
                 if (skb_headroom(skb) < ENCAPS_OVERHEAD) {
@@ -1170,7 +1170,7 @@ static void orinoco_join_ap(struct work_struct *work)
         struct join_req {
                 u8 bssid[ETH_ALEN];
                 __le16 channel;
-        } __attribute__ ((packed)) req;
+        } __packed req;
         const int atom_len = offsetof(struct prism2_scan_apinfo, atim);
         struct prism2_scan_apinfo *atom = NULL;
         int offset = 4;
@@ -1410,7 +1410,7 @@ void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
         struct {
                 __le16 len;
                 __le16 type;
-        } __attribute__ ((packed)) info;
+        } __packed info;
         int len, type;
         int err;
 
diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/orinoco/orinoco.h
index a6da86e0a70..255710ef082 100644
--- a/drivers/net/wireless/orinoco/orinoco.h
+++ b/drivers/net/wireless/orinoco/orinoco.h
@@ -32,7 +32,7 @@
 struct orinoco_key {
         __le16 len;     /* always stored as little-endian */
         char data[ORINOCO_MAX_KEY_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define TKIP_KEYLEN     16
 #define MIC_KEYLEN      8
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 020da76c955..1558381998e 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -90,7 +90,7 @@ struct header_struct {
         /* SNAP */
         u8 oui[3];
         __be16 ethertype;
-} __attribute__ ((packed));
+} __packed;
 
 struct ez_usb_fw {
         u16 size;
@@ -222,7 +222,7 @@ struct ezusb_packet {
         __le16 hermes_len;
         __le16 hermes_rid;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 /* Table of devices that work or may work with this driver */
 static struct usb_device_id ezusb_table[] = {
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index a63108c6df7..cf7be1eb612 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -128,7 +128,7 @@ static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
         } else {
                 struct {
                         __le16 qual, signal, noise, unused;
-                } __attribute__ ((packed)) cq;
+                } __packed cq;
 
                 err = HERMES_READ_RECORD(hw, USER_BAP,
                                          HERMES_RID_COMMSQUALITY, &cq);
diff --git a/drivers/net/wireless/p54/net2280.h b/drivers/net/wireless/p54/net2280.h
index 4915d9d5420..e3ed893b5aa 100644
--- a/drivers/net/wireless/p54/net2280.h
+++ b/drivers/net/wireless/p54/net2280.h
@@ -232,7 +232,7 @@ struct net2280_regs {
 #define GPIO2_INTERRUPT                                         2
 #define GPIO1_INTERRUPT                                         1
 #define GPIO0_INTERRUPT                                         0
-} __attribute__ ((packed));
+} __packed;
 
 /* usb control, BAR0 + 0x0080 */
 struct net2280_usb_regs {
@@ -296,7 +296,7 @@ struct net2280_usb_regs {
 #define FORCE_IMMEDIATE                                         7
 #define OUR_USB_ADDRESS                                         0
         __le32                  ourconfig;
-} __attribute__ ((packed));
+} __packed;
 
 /* pci control, BAR0 + 0x0100 */
 struct net2280_pci_regs {
@@ -323,7 +323,7 @@ struct net2280_pci_regs {
 #define PCI_ARBITER_CLEAR                                       2
 #define PCI_EXTERNAL_ARBITER                                    1
 #define PCI_HOST_MODE                                           0
-} __attribute__ ((packed));
+} __packed;
 
 /* dma control, BAR0 + 0x0180 ... array of four structs like this,
  * for channels 0..3.  see also struct net2280_dma:  descriptor
@@ -364,7 +364,7 @@ struct net2280_dma_regs {	/* [11.7] */
         __le32                  dmaaddr;
         __le32                  dmadesc;
         u32                     _unused1;
-} __attribute__ ((packed));
+} __packed;
 
 /* dedicated endpoint registers, BAR0 + 0x0200 */
 
@@ -374,7 +374,7 @@ struct net2280_dep_regs {	/* [11.8] */
         /* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */
         __le32                  dep_rsp;
         u32                     _unused[2];
-} __attribute__ ((packed));
+} __packed;
 
 /* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
  * like this, for ep0 then the configurable endpoints A..F
@@ -437,16 +437,16 @@ struct net2280_ep_regs {	/* [11.9] */
         __le32                  ep_avail;
         __le32                  ep_data;
         u32                     _unused0[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct net2280_reg_write {
         __le16 port;
         __le32 addr;
         __le32 val;
-} __attribute__ ((packed));
+} __packed;
 
 struct net2280_reg_read {
         __le16 port;
         __le32 addr;
-} __attribute__ ((packed));
+} __packed;
 #endif /* NET2280_H */
diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h
index 2feead617a3..ee9bc62a4fa 100644
--- a/drivers/net/wireless/p54/p54pci.h
+++ b/drivers/net/wireless/p54/p54pci.h
@@ -65,7 +65,7 @@ struct p54p_csr {
         u8 unused_6[1924];
         u8 cardbus_cis[0x800];
         u8 direct_mem_win[0x1000];
-} __attribute__ ((packed));
+} __packed;
 
 /* usb backend only needs the register defines above */
 #ifndef P54USB_H
@@ -74,7 +74,7 @@ struct p54p_desc {
         __le32 device_addr;
         __le16 len;
         __le16 flags;
-} __attribute__ ((packed));
+} __packed;
 
 struct p54p_ring_control {
         __le32 host_idx[4];
@@ -83,7 +83,7 @@ struct p54p_ring_control {
         struct p54p_desc tx_data[32];
         struct p54p_desc rx_mgmt[4];
         struct p54p_desc tx_mgmt[4];
-} __attribute__ ((packed));
+} __packed;
 
 #define P54P_READ(r) (__force __le32)__raw_readl(&priv->map->r)
 #define P54P_WRITE(r, val) __raw_writel((__force u32)(__le32)(val), &priv->map->r)
diff --git a/drivers/net/wireless/p54/p54spi.h b/drivers/net/wireless/p54/p54spi.h
index 7fbe8d8fc67..dfaa62aaeb0 100644
--- a/drivers/net/wireless/p54/p54spi.h
+++ b/drivers/net/wireless/p54/p54spi.h
@@ -96,7 +96,7 @@ struct p54s_dma_regs {
         __le16 cmd;
         __le16 len;
         __le32 addr;
-} __attribute__ ((packed));
+} __packed;
 
 struct p54s_tx_info {
         struct list_head tx_list;
diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h
index e935b79f7f7..ed4034ade59 100644
--- a/drivers/net/wireless/p54/p54usb.h
+++ b/drivers/net/wireless/p54/p54usb.h
@@ -70,12 +70,12 @@ struct net2280_tx_hdr {
         __le16 len;
         __le16 follower;        /* ? */
         u8 padding[8];
-} __attribute__((packed));
+} __packed;
 
 struct lm87_tx_hdr {
         __le32 device_addr;
         __le32 chksum;
-} __attribute__((packed));
+} __packed;
 
 /* Some flags for the isl hardware registers controlling DMA inside the
  * chip */
@@ -103,7 +103,7 @@ struct x2_header {
         __le32 fw_load_addr;
         __le32 fw_length;
         __le32 crc;
-} __attribute__((packed));
+} __packed;
 
 /* pipes 3 and 4 are not used by the driver */
 #define P54U_PIPE_NUMBER 9
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 236e37526d0..912fdc022d0 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2101,7 +2101,7 @@ struct ieee80211_beacon_phdr {
         u8 timestamp[8];
         u16 beacon_int;
         u16 capab_info;
-} __attribute__ ((packed));
+} __packed;
 
 #define WLAN_EID_GENERIC 0xdd
 static u8 wpa_oid[4] = { 0x00, 0x50, 0xf2, 1 };
diff --git a/drivers/net/wireless/prism54/isl_oid.h b/drivers/net/wireless/prism54/isl_oid.h
index b7534c2869c..59e31258d45 100644
--- a/drivers/net/wireless/prism54/isl_oid.h
+++ b/drivers/net/wireless/prism54/isl_oid.h
@@ -29,20 +29,20 @@
 struct obj_ssid {
         u8 length;
         char octets[33];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_key {
         u8 type;                /* dot11_priv_t */
         u8 length;
         char key[32];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_mlme {
         u8 address[6];
         u16 id;
         u16 state;
         u16 code;
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_mlmeex {
         u8 address[6];
@@ -51,12 +51,12 @@ struct obj_mlmeex {
         u16 code;
         u16 size;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_buffer {
         u32 size;
         u32 addr;               /* 32bit bus address */
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_bss {
         u8 address[6];
@@ -77,17 +77,17 @@ struct obj_bss {
         short rates;
         short basic_rates;
         int:16;                 /* padding */
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_bsslist {
         u32 nr;
         struct obj_bss bsslist[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_frequencies {
         u16 nr;
         u16 mhz[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct obj_attachment {
         char type;
@@ -95,7 +95,7 @@ struct obj_attachment {
         short id;
         short size;
         char data[0];
-} __attribute__((packed));
+} __packed;
 
 /*
  * in case everything's ok, the inlined function below will be
diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h
index 54f9a4b7bf9..6ca30a5b7bf 100644
--- a/drivers/net/wireless/prism54/islpci_eth.h
+++ b/drivers/net/wireless/prism54/islpci_eth.h
@@ -34,13 +34,13 @@ struct rfmon_header {
         __le16 unk3;
         u8 rssi;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct rx_annex_header {
         u8 addr1[ETH_ALEN];
         u8 addr2[ETH_ALEN];
         struct rfmon_header rfmon;
-} __attribute__ ((packed));
+} __packed;
 
 /* wlan-ng (and hopefully others) AVS header, version one.  Fields in
  * network byte order. */
diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h
index 0b27e50fe0d..0db93db9b67 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.h
+++ b/drivers/net/wireless/prism54/islpci_mgt.h
@@ -101,7 +101,7 @@ typedef struct {
         u8 device_id;
         u8 flags;
         u32 length;
-} __attribute__ ((packed))
+} __packed
 pimfor_header_t;
 
 /* A received and interrupt-processed management frame, either for
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 4102cca5488..5e7f344b000 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -238,19 +238,19 @@ struct ndis_80211_auth_request {
         u8 bssid[6];
         u8 padding[2];
         __le32 flags;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_pmkid_candidate {
         u8 bssid[6];
         u8 padding[2];
         __le32 flags;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_pmkid_cand_list {
         __le32 version;
         __le32 num_candidates;
         struct ndis_80211_pmkid_candidate candidate_list[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_status_indication {
         __le32 status_type;
@@ -260,19 +260,19 @@ struct ndis_80211_status_indication {
                 struct ndis_80211_auth_request          auth_request[0];
                 struct ndis_80211_pmkid_cand_list       cand_list;
         } u;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_ssid {
         __le32 length;
         u8 essid[NDIS_802_11_LENGTH_SSID];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_conf_freq_hop {
         __le32 length;
         __le32 hop_pattern;
         __le32 hop_set;
         __le32 dwell_time;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_conf {
         __le32 length;
@@ -280,7 +280,7 @@ struct ndis_80211_conf {
         __le32 atim_window;
         __le32 ds_config;
         struct ndis_80211_conf_freq_hop fh_config;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_ex {
         __le32 length;
@@ -295,25 +295,25 @@ struct ndis_80211_bssid_ex {
         u8 rates[NDIS_802_11_LENGTH_RATES_EX];
         __le32 ie_length;
         u8 ies[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_list_ex {
         __le32 num_items;
         struct ndis_80211_bssid_ex bssid[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_fixed_ies {
         u8 timestamp[8];
         __le16 beacon_interval;
         __le16 capabilities;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_wep_key {
         __le32 size;
         __le32 index;
         __le32 length;
         u8 material[32];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_key {
         __le32 size;
@@ -323,14 +323,14 @@ struct ndis_80211_key {
         u8 padding[6];
         u8 rsc[8];
         u8 material[32];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_remove_key {
         __le32 size;
         __le32 index;
         u8 bssid[6];
         u8 padding[2];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_config_param {
         __le32 name_offs;
@@ -338,7 +338,7 @@ struct ndis_config_param {
         __le32 type;
         __le32 value_offs;
         __le32 value_length;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_assoc_info {
         __le32 length;
@@ -358,12 +358,12 @@ struct ndis_80211_assoc_info {
         } resp_ie;
         __le32 resp_ie_length;
         __le32 offset_resp_ies;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_auth_encr_pair {
         __le32 auth_mode;
         __le32 encr_mode;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_capability {
         __le32 length;
@@ -371,7 +371,7 @@ struct ndis_80211_capability {
         __le32 num_pmkids;
         __le32 num_auth_encr_pair;
         struct ndis_80211_auth_encr_pair auth_encr_pair[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_info {
         u8 bssid[6];
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 3ed87badc2d..552f9f4c73d 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -1417,17 +1417,17 @@
 struct mac_wcid_entry {
         u8 mac[6];
         u8 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct hw_key_entry {
         u8 key[16];
         u8 tx_mic[8];
         u8 rx_mic[8];
-} __attribute__ ((packed));
+} __packed;
 
 struct mac_iveiv_entry {
         u8 iv[8];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * MAC_WCID_ATTRIBUTE:
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index df80f1af22a..e2e728ab0b2 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -153,13 +153,13 @@ struct hw_key_entry {
         u8 key[16];
         u8 tx_mic[8];
         u8 rx_mic[8];
-} __attribute__ ((packed));
+} __packed;
 
 struct hw_pairwise_ta_entry {
         u8 address[6];
         u8 cipher;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Other on-chip shared memory space.
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h
index 7abe7eb1455..44d5b2bebd3 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.h
+++ b/drivers/net/wireless/rt2x00/rt73usb.h
@@ -108,13 +108,13 @@ struct hw_key_entry {
         u8 key[16];
         u8 tx_mic[8];
         u8 rx_mic[8];
-} __attribute__ ((packed));
+} __packed;
 
 struct hw_pairwise_ta_entry {
         u8 address[6];
         u8 cipher;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Since NULL frame won't be that long (256 byte),
diff --git a/drivers/net/wireless/rtl818x/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180.h
index 4baf0cf0826..30523314da4 100644
--- a/drivers/net/wireless/rtl818x/rtl8180.h
+++ b/drivers/net/wireless/rtl818x/rtl8180.h
@@ -36,7 +36,7 @@ struct rtl8180_tx_desc {
         u8 agc;
         u8 flags2;
         u32 reserved[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct rtl8180_rx_desc {
         __le32 flags;
@@ -45,7 +45,7 @@ struct rtl8180_rx_desc {
                 __le32 rx_buf;
                 __le64 tsft;
         };
-} __attribute__ ((packed));
+} __packed;
 
 struct rtl8180_tx_ring {
         struct rtl8180_tx_desc *desc;
diff --git a/drivers/net/wireless/rtl818x/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187.h
index 6bb32112e65..98878160a65 100644
--- a/drivers/net/wireless/rtl818x/rtl8187.h
+++ b/drivers/net/wireless/rtl818x/rtl8187.h
@@ -47,7 +47,7 @@ struct rtl8187_rx_hdr {
         u8 agc;
         u8 reserved;
         __le64 mac_time;
-} __attribute__((packed));
+} __packed;
 
 struct rtl8187b_rx_hdr {
         __le32 flags;
@@ -59,7 +59,7 @@ struct rtl8187b_rx_hdr {
         __le16 snr_long2end;
         s8 pwdb_g12;
         u8 fot;
-} __attribute__((packed));
+} __packed;
 
 /* {rtl8187,rtl8187b}_tx_info is in skb */
 
@@ -68,7 +68,7 @@ struct rtl8187_tx_hdr {
         __le16 rts_duration;
         __le16 len;
         __le32 retry;
-} __attribute__((packed));
+} __packed;
 
 struct rtl8187b_tx_hdr {
         __le32 flags;
@@ -80,7 +80,7 @@ struct rtl8187b_tx_hdr {
         __le32 unused_3;
         __le32 retry;
         __le32 unused_4[2];
-} __attribute__((packed));
+} __packed;
 
 enum {
         DEVICE_RTL8187,
diff --git a/drivers/net/wireless/rtl818x/rtl818x.h b/drivers/net/wireless/rtl818x/rtl818x.h
index 8522490d2e2..978519d1ff4 100644
--- a/drivers/net/wireless/rtl818x/rtl818x.h
+++ b/drivers/net/wireless/rtl818x/rtl818x.h
@@ -185,7 +185,7 @@ struct rtl818x_csr {
         u8      reserved_22[4];
         __le16  TALLY_CNT;
         u8      TALLY_SEL;
-} __attribute__((packed));
+} __packed;
 
 struct rtl818x_rf_ops {
         char *name;
diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.h b/drivers/net/wireless/wl12xx/wl1251_acx.h
index 26160c45784..842df310d92 100644
--- a/drivers/net/wireless/wl12xx/wl1251_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1251_acx.h
@@ -60,7 +60,7 @@ struct acx_error_counter {
         /* the number of missed sequence numbers in the squentially */
         /* values of frames seq numbers */
         u32 seq_num_miss;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_revision {
         struct acx_header header;
@@ -89,7 +89,7 @@ struct acx_revision {
          * bits 24 - 31: Chip ID - The WiLink chip ID.
          */
         u32 hw_version;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1251_psm_mode {
         /* Active mode */
@@ -111,7 +111,7 @@ struct acx_sleep_auth {
         /* 2 - ELP mode: Deep / Max sleep*/
         u8  sleep_auth;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         HOSTIF_PCI_MASTER_HOST_INDIRECT,
@@ -159,7 +159,7 @@ struct acx_data_path_params {
          * complete ring until an interrupt is generated.
          */
         u32 tx_complete_timeout;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct acx_data_path_params_resp {
@@ -180,7 +180,7 @@ struct acx_data_path_params_resp {
         u32 tx_control_addr;
 
         u32 tx_complete_addr;
-} __attribute__ ((packed));
+} __packed;
 
 #define TX_MSDU_LIFETIME_MIN       0
 #define TX_MSDU_LIFETIME_MAX       3000
@@ -197,7 +197,7 @@ struct acx_rx_msdu_lifetime {
          * firmware discards the MSDU.
          */
         u32 lifetime;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * RX Config Options Table
@@ -285,7 +285,7 @@ struct acx_rx_config {
 
         u32 config_options;
         u32 filter_options;
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         QOS_AC_BE = 0,
@@ -325,13 +325,13 @@ struct acx_tx_queue_qos_config {
 
         /* Lowest memory blocks guaranteed for this queue */
         u16 low_threshold;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_packet_detection {
         struct acx_header header;
 
         u32 threshold;
-} __attribute__ ((packed));
+} __packed;
 
 
 enum acx_slot_type {
@@ -349,7 +349,7 @@ struct acx_slot {
         u8 wone_index; /* Reserved */
         u8 slot_time;
         u8 reserved[6];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ADDRESS_GROUP_MAX       (8)
@@ -362,7 +362,7 @@ struct acx_dot11_grp_addr_tbl {
         u8 num_groups;
         u8 pad[2];
         u8 mac_table[ADDRESS_GROUP_MAX_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define  RX_TIMEOUT_PS_POLL_MIN    0
@@ -388,7 +388,7 @@ struct acx_rx_timeout {
          * from an UPSD enabled queue.
          */
         u16 upsd_timeout;
-} __attribute__ ((packed));
+} __packed;
 
 #define RTS_THRESHOLD_MIN              0
 #define RTS_THRESHOLD_MAX              4096
@@ -399,7 +399,7 @@ struct acx_rts_threshold {
 
         u16 threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_beacon_filter_option {
         struct acx_header header;
@@ -415,7 +415,7 @@ struct acx_beacon_filter_option {
          */
         u8 max_num_beacons;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * ACXBeaconFilterEntry (not 221)
@@ -461,7 +461,7 @@ struct acx_beacon_filter_ie_table {
         u8 num_ie;
         u8 table[BEACON_FILTER_TABLE_MAX_SIZE];
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define SYNCH_FAIL_DEFAULT_THRESHOLD    10     /* number of beacons */
 #define NO_BEACON_DEFAULT_TIMEOUT       (500) /* in microseconds */
@@ -494,7 +494,7 @@ struct acx_bt_wlan_coex {
          */
         u8 enable;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define PTA_ANTENNA_TYPE_DEF              (0)
 #define PTA_BT_HP_MAXTIME_DEF             (2000)
@@ -648,7 +648,7 @@ struct acx_bt_wlan_coex_param {
 
         /* range: 0 - 20  default: 1 */
         u8 bt_hp_respected_num;
-} __attribute__ ((packed));
+} __packed;
 
 #define CCA_THRSH_ENABLE_ENERGY_D       0x140A
 #define CCA_THRSH_DISABLE_ENERGY_D      0xFFEF
@@ -660,7 +660,7 @@ struct acx_energy_detection {
         u16 rx_cca_threshold;
         u8 tx_energy_detection;
         u8 pad;
-} __attribute__ ((packed));
+} __packed;
 
 #define BCN_RX_TIMEOUT_DEF_VALUE        10000
 #define BROADCAST_RX_TIMEOUT_DEF_VALUE  20000
@@ -679,14 +679,14 @@ struct acx_beacon_broadcast {
         /* Consecutive PS Poll failures before updating the host */
         u8 ps_poll_threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_mask {
         struct acx_header header;
 
         u32 event_mask;
         u32 high_event_mask; /* Unused */
-} __attribute__ ((packed));
+} __packed;
 
 #define CFG_RX_FCS              BIT(2)
 #define CFG_RX_ALL_GOOD         BIT(3)
@@ -729,7 +729,7 @@ struct acx_fw_gen_frame_rates {
         u8 tx_ctrl_frame_mod; /* CCK_* or PBCC_* */
         u8 tx_mgt_frame_rate;
         u8 tx_mgt_frame_mod;
-} __attribute__ ((packed));
+} __packed;
 
 /* STA MAC */
 struct acx_dot11_station_id {
@@ -737,28 +737,28 @@ struct acx_dot11_station_id {
 
         u8 mac[ETH_ALEN];
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_feature_config {
         struct acx_header header;
 
         u32 options;
         u32 data_flow_options;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_current_tx_power {
         struct acx_header header;
 
         u8  current_tx_power;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dot11_default_key {
         struct acx_header header;
 
         u8 id;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tsf_info {
         struct acx_header header;
@@ -769,7 +769,7 @@ struct acx_tsf_info {
         u32 last_TBTT_lsb;
         u8 last_dtim_count;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_wake_up_event {
         WAKE_UP_EVENT_BEACON_BITMAP     = 0x01, /* Wake on every Beacon*/
@@ -785,7 +785,7 @@ struct acx_wake_up_condition {
         u8 wake_up_event; /* Only one bit can be set */
         u8 listen_interval;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aid {
         struct acx_header header;
@@ -795,7 +795,7 @@ struct acx_aid {
          */
         u16 aid;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_preamble_type {
         ACX_PREAMBLE_LONG = 0,
@@ -811,7 +811,7 @@ struct acx_preamble {
          */
         u8 preamble;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_ctsprotect_type {
         CTSPROTECT_DISABLE = 0,
@@ -822,11 +822,11 @@ struct acx_ctsprotect {
         struct acx_header header;
         u8 ctsprotect;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tx_statistics {
         u32 internal_desc_overflow;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_rx_statistics {
         u32 out_of_mem;
@@ -837,14 +837,14 @@ struct acx_rx_statistics {
         u32 xfr_hint_trig;
         u32 path_reset;
         u32 reset_counter;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dma_statistics {
         u32 rx_requested;
         u32 rx_errors;
         u32 tx_requested;
         u32 tx_errors;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_isr_statistics {
         /* host command complete */
@@ -903,7 +903,7 @@ struct acx_isr_statistics {
 
         /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
         u32 low_rssi;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_wep_statistics {
         /* WEP address keys configured */
@@ -925,7 +925,7 @@ struct acx_wep_statistics {
 
         /* WEP decrypt interrupts */
         u32 interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_MISSED_BEACONS_SPREAD 10
 
@@ -985,12 +985,12 @@ struct acx_pwr_statistics {
 
         /* the number of beacons in awake mode */
         u32 rcvd_awake_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_mic_statistics {
         u32 rx_pkts;
         u32 calc_failure;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aes_statistics {
         u32 encrypt_fail;
@@ -999,7 +999,7 @@ struct acx_aes_statistics {
         u32 decrypt_packets;
         u32 encrypt_interrupt;
         u32 decrypt_interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_statistics {
         u32 heart_beat;
@@ -1010,7 +1010,7 @@ struct acx_event_statistics {
         u32 oom_late;
         u32 phy_transmit_error;
         u32 tx_stuck;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_ps_statistics {
         u32 pspoll_timeouts;
@@ -1020,7 +1020,7 @@ struct acx_ps_statistics {
         u32 pspoll_max_apturn;
         u32 pspoll_utilization;
         u32 upsd_utilization;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rxpipe_statistics {
         u32 rx_prep_beacon_drop;
@@ -1028,7 +1028,7 @@ struct acx_rxpipe_statistics {
         u32 beacon_buffer_thres_host_int_trig_rx_data;
         u32 missed_beacon_host_int_trig_rx_data;
         u32 tx_xfr_host_int_trig_rx_data;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_statistics {
         struct acx_header header;
@@ -1044,7 +1044,7 @@ struct acx_statistics {
         struct acx_event_statistics event;
         struct acx_ps_statistics ps;
         struct acx_rxpipe_statistics rxpipe;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_MAX_RATE_CLASSES       8
 #define ACX_RATE_MASK_UNSPECIFIED  0
@@ -1063,7 +1063,7 @@ struct acx_rate_policy {
 
         u32 rate_class_cnt;
         struct acx_rate_class rate_class[ACX_MAX_RATE_CLASSES];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_acx_memory {
         __le16 num_stations; /* number of STAs to be supported. */
@@ -1082,7 +1082,7 @@ struct wl1251_acx_memory {
         u8 tx_min_mem_block_num;
         u8 num_ssid_profiles;
         __le16 debug_buffer_size;
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ACX_RX_DESC_MIN                1
@@ -1094,7 +1094,7 @@ struct wl1251_acx_rx_queue_config {
         u8 type;
         u8 priority;
         __le32 dma_address;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_TX_DESC_MIN                1
 #define ACX_TX_DESC_MAX                127
@@ -1103,7 +1103,7 @@ struct wl1251_acx_tx_queue_config {
     u8 num_descs;
     u8 pad[2];
     u8 attributes;
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_TX_QUEUE_CONFIGS 5
 #define MAX_TX_QUEUES 4
@@ -1113,7 +1113,7 @@ struct wl1251_acx_config_memory {
         struct wl1251_acx_memory mem_config;
         struct wl1251_acx_rx_queue_config rx_queue_config;
         struct wl1251_acx_tx_queue_config tx_queue_config[MAX_TX_QUEUE_CONFIGS];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_acx_mem_map {
         struct acx_header header;
@@ -1147,7 +1147,7 @@ struct wl1251_acx_mem_map {
 
         /* Number of blocks FW allocated for RX packets */
         u32 num_rx_mem_blocks;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct wl1251_acx_wr_tbtt_and_dtim {
@@ -1164,7 +1164,7 @@ struct wl1251_acx_wr_tbtt_and_dtim {
         */
         u8  dtim;
         u8  padding;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_acx_ac_cfg {
         struct acx_header header;
@@ -1194,7 +1194,7 @@ struct wl1251_acx_ac_cfg {
 
         /* The TX Op Limit (in microseconds) for the access class. */
         u16 txop_limit;
-} __attribute__ ((packed));
+} __packed;
 
 
 enum wl1251_acx_channel_type {
@@ -1245,7 +1245,7 @@ struct wl1251_acx_tid_cfg {
 
         /* not supported */
         u32 apsdconf[2];
-} __attribute__ ((packed));
+} __packed;
 
 /*************************************************************************
 
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.h b/drivers/net/wireless/wl12xx/wl1251_cmd.h
index 4ad67cae94d..7e70dd5a21b 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.h
@@ -106,7 +106,7 @@ struct wl1251_cmd_header {
         u16 status;
         /* payload */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct  wl1251_command {
         struct wl1251_cmd_header header;
@@ -201,7 +201,7 @@ struct wl1251_scan_parameters {
         u8 ssid_len;
         u8 ssid[32];
 
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_scan_ch_parameters {
         u32 min_duration; /* in TU */
@@ -218,7 +218,7 @@ struct wl1251_scan_ch_parameters {
         u8 tx_power_att;
         u8 channel;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 /* SCAN parameters */
 #define SCAN_MAX_NUM_OF_CHANNELS 16
@@ -228,7 +228,7 @@ struct wl1251_cmd_scan {
 
         struct wl1251_scan_parameters params;
         struct wl1251_scan_ch_parameters channels[SCAN_MAX_NUM_OF_CHANNELS];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         BSS_TYPE_IBSS = 0,
@@ -276,14 +276,14 @@ struct cmd_join {
         u8 tx_mgt_frame_rate; /* OBSOLETE */
         u8 tx_mgt_frame_mod;  /* OBSOLETE */
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_enabledisable_path {
         struct wl1251_cmd_header header;
 
         u8 channel;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1251_MAX_TEMPLATE_SIZE 300
 
@@ -292,7 +292,7 @@ struct wl1251_cmd_packet_template {
 
         __le16 size;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define TIM_ELE_ID    5
 #define PARTIAL_VBM_MAX    251
@@ -304,7 +304,7 @@ struct wl1251_tim {
         u8 dtim_period;
         u8 bitmap_ctrl;
         u8 pvb_field[PARTIAL_VBM_MAX]; /* Partial Virtual Bitmap */
-} __attribute__ ((packed));
+} __packed;
 
 /* Virtual Bit Map update */
 struct wl1251_cmd_vbm_update {
@@ -312,7 +312,7 @@ struct wl1251_cmd_vbm_update {
         __le16 len;
         u8  padding[2];
         struct wl1251_tim tim;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1251_cmd_ps_mode {
         STATION_ACTIVE_MODE,
@@ -333,7 +333,7 @@ struct wl1251_cmd_ps_params {
         u8 hang_over_period;
         u16 null_data_rate;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1251_cmd_trigger_scan_to {
         struct wl1251_cmd_header header;
@@ -411,7 +411,7 @@ struct wl1251_cmd_set_keys {
         u8 key[MAX_KEY_SIZE];
         u16 ac_seq_num16[NUM_ACCESS_CATEGORIES_COPY];
         u32 ac_seq_num32[NUM_ACCESS_CATEGORIES_COPY];
-} __attribute__ ((packed));
+} __packed;
 
 
 #endif /* __WL1251_CMD_H__ */
diff --git a/drivers/net/wireless/wl12xx/wl1251_event.h b/drivers/net/wireless/wl12xx/wl1251_event.h
index be0ac54d624..f48a2b66bc5 100644
--- a/drivers/net/wireless/wl12xx/wl1251_event.h
+++ b/drivers/net/wireless/wl12xx/wl1251_event.h
@@ -82,7 +82,7 @@ struct event_debug_report {
         u32 report_1;
         u32 report_2;
         u32 report_3;
-} __attribute__ ((packed));
+} __packed;
 
 struct event_mailbox {
         u32 events_vector;
@@ -112,7 +112,7 @@ struct event_mailbox {
         struct event_debug_report report;
         u8 average_snr_level;
         u8 padding[19];
-} __attribute__ ((packed));
+} __packed;
 
 int wl1251_event_unmask(struct wl1251 *wl);
 void wl1251_event_mbox_config(struct wl1251 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.h b/drivers/net/wireless/wl12xx/wl1251_rx.h
index 563a3fde40f..da4e53406a0 100644
--- a/drivers/net/wireless/wl12xx/wl1251_rx.h
+++ b/drivers/net/wireless/wl12xx/wl1251_rx.h
@@ -117,7 +117,7 @@ struct wl1251_rx_descriptor {
         s8 rssi; /* in dB */
         u8 rcpi; /* in dB */
         u8 snr; /* in dB */
-} __attribute__ ((packed));
+} __packed;
 
 void wl1251_rx(struct wl1251 *wl);
 
diff --git a/drivers/net/wireless/wl12xx/wl1251_tx.h b/drivers/net/wireless/wl12xx/wl1251_tx.h
index 55856c6bb97..65c4be8c2e8 100644
--- a/drivers/net/wireless/wl12xx/wl1251_tx.h
+++ b/drivers/net/wireless/wl12xx/wl1251_tx.h
@@ -109,7 +109,7 @@ struct tx_control {
         unsigned xfer_pad:1;
 
         unsigned reserved:7;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct tx_double_buffer_desc {
@@ -156,7 +156,7 @@ struct tx_double_buffer_desc {
         u8 num_mem_blocks;
 
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         TX_SUCCESS              = 0,
@@ -208,7 +208,7 @@ struct tx_result {
 
         /* See done_1 */
         u8 done_2;
-} __attribute__ ((packed));
+} __packed;
 
 static inline int wl1251_tx_get_queue(int queue)
 {
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 1b52ce6a84d..ec09f0d40ca 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -291,7 +291,7 @@ struct wl1271_fw_status {
         __le32 tx_released_blks[NUM_TX_QUEUES];
         __le32 fw_localtime;
         __le32 padding[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_rx_mem_pool_addr {
         u32 addr;
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index 420e7e2fc02..4c87e601df2 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -75,7 +75,7 @@ struct acx_header {
 
         /* payload length (not including headers */
         __le16 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_error_counter {
         struct acx_header header;
@@ -98,7 +98,7 @@ struct acx_error_counter {
         /* the number of missed sequence numbers in the squentially */
         /* values of frames seq numbers */
         __le32 seq_num_miss;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_revision {
         struct acx_header header;
@@ -127,7 +127,7 @@ struct acx_revision {
          * bits 24 - 31: Chip ID - The WiLink chip ID.
          */
         __le32 hw_version;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_psm_mode {
         /* Active mode */
@@ -149,7 +149,7 @@ struct acx_sleep_auth {
         /* 2 - ELP mode: Deep / Max sleep*/
         u8  sleep_auth;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         HOSTIF_PCI_MASTER_HOST_INDIRECT,
@@ -187,7 +187,7 @@ struct acx_rx_msdu_lifetime {
          * firmware discards the MSDU.
          */
         __le32 lifetime;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * RX Config Options Table
@@ -275,13 +275,13 @@ struct acx_rx_config {
 
         __le32 config_options;
         __le32 filter_options;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_packet_detection {
         struct acx_header header;
 
         __le32 threshold;
-} __attribute__ ((packed));
+} __packed;
 
 
 enum acx_slot_type {
@@ -299,7 +299,7 @@ struct acx_slot {
         u8 wone_index; /* Reserved */
         u8 slot_time;
         u8 reserved[6];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define ACX_MC_ADDRESS_GROUP_MAX        (8)
@@ -312,21 +312,21 @@ struct acx_dot11_grp_addr_tbl {
         u8 num_groups;
         u8 pad[2];
         u8 mac_table[ADDRESS_GROUP_MAX_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rx_timeout {
         struct acx_header header;
 
         __le16 ps_poll_timeout;
         __le16 upsd_timeout;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rts_threshold {
         struct acx_header header;
 
         __le16 threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_beacon_filter_option {
         struct acx_header header;
@@ -342,7 +342,7 @@ struct acx_beacon_filter_option {
          */
         u8 max_num_beacons;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * ACXBeaconFilterEntry (not 221)
@@ -383,21 +383,21 @@ struct acx_beacon_filter_ie_table {
         u8 num_ie;
         u8 pad[3];
         u8 table[BEACON_FILTER_TABLE_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_conn_monit_params {
        struct acx_header header;
 
        __le32 synch_fail_thold; /* number of beacons missed */
        __le32 bss_lose_timeout; /* number of TU's from synch fail */
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_bt_wlan_coex {
         struct acx_header header;
 
         u8 enable;
         u8 pad[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_bt_wlan_coex_param {
         struct acx_header header;
@@ -405,7 +405,7 @@ struct acx_bt_wlan_coex_param {
         __le32 params[CONF_SG_PARAMS_MAX];
         u8 param_idx;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dco_itrim_params {
         struct acx_header header;
@@ -413,7 +413,7 @@ struct acx_dco_itrim_params {
         u8 enable;
         u8 padding[3];
         __le32 timeout;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_energy_detection {
         struct acx_header header;
@@ -422,7 +422,7 @@ struct acx_energy_detection {
         __le16 rx_cca_threshold;
         u8 tx_energy_detection;
         u8 pad;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_beacon_broadcast {
         struct acx_header header;
@@ -436,14 +436,14 @@ struct acx_beacon_broadcast {
         /* Consecutive PS Poll failures before updating the host */
         u8 ps_poll_threshold;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_mask {
         struct acx_header header;
 
         __le32 event_mask;
         __le32 high_event_mask; /* Unused */
-} __attribute__ ((packed));
+} __packed;
 
 #define CFG_RX_FCS              BIT(2)
 #define CFG_RX_ALL_GOOD         BIT(3)
@@ -488,14 +488,14 @@ struct acx_feature_config {
 
         __le32 options;
         __le32 data_flow_options;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_current_tx_power {
         struct acx_header header;
 
         u8  current_tx_power;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_wake_up_condition {
         struct acx_header header;
@@ -503,7 +503,7 @@ struct acx_wake_up_condition {
         u8 wake_up_event; /* Only one bit can be set */
         u8 listen_interval;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aid {
         struct acx_header header;
@@ -513,7 +513,7 @@ struct acx_aid {
          */
         __le16 aid;
         u8 pad[2];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_preamble_type {
         ACX_PREAMBLE_LONG = 0,
@@ -529,7 +529,7 @@ struct acx_preamble {
          */
         u8 preamble;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum acx_ctsprotect_type {
         CTSPROTECT_DISABLE = 0,
@@ -540,11 +540,11 @@ struct acx_ctsprotect {
         struct acx_header header;
         u8 ctsprotect;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tx_statistics {
         __le32 internal_desc_overflow;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_rx_statistics {
         __le32 out_of_mem;
@@ -555,14 +555,14 @@ struct acx_rx_statistics {
         __le32 xfr_hint_trig;
         __le32 path_reset;
         __le32 reset_counter;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_dma_statistics {
         __le32 rx_requested;
         __le32 rx_errors;
         __le32 tx_requested;
         __le32 tx_errors;
-}  __attribute__ ((packed));
+}  __packed;
 
 struct acx_isr_statistics {
         /* host command complete */
@@ -621,7 +621,7 @@ struct acx_isr_statistics {
 
         /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
         __le32 low_rssi;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_wep_statistics {
         /* WEP address keys configured */
@@ -643,7 +643,7 @@ struct acx_wep_statistics {
 
         /* WEP decrypt interrupts */
         __le32 interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_MISSED_BEACONS_SPREAD 10
 
@@ -703,12 +703,12 @@ struct acx_pwr_statistics {
 
         /* the number of beacons in awake mode */
         __le32 rcvd_awake_beacons;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_mic_statistics {
         __le32 rx_pkts;
         __le32 calc_failure;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_aes_statistics {
         __le32 encrypt_fail;
@@ -717,7 +717,7 @@ struct acx_aes_statistics {
         __le32 decrypt_packets;
         __le32 encrypt_interrupt;
         __le32 decrypt_interrupt;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_event_statistics {
         __le32 heart_beat;
@@ -728,7 +728,7 @@ struct acx_event_statistics {
         __le32 oom_late;
         __le32 phy_transmit_error;
         __le32 tx_stuck;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_ps_statistics {
         __le32 pspoll_timeouts;
@@ -738,7 +738,7 @@ struct acx_ps_statistics {
         __le32 pspoll_max_apturn;
         __le32 pspoll_utilization;
         __le32 upsd_utilization;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rxpipe_statistics {
         __le32 rx_prep_beacon_drop;
@@ -746,7 +746,7 @@ struct acx_rxpipe_statistics {
         __le32 beacon_buffer_thres_host_int_trig_rx_data;
         __le32 missed_beacon_host_int_trig_rx_data;
         __le32 tx_xfr_host_int_trig_rx_data;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_statistics {
         struct acx_header header;
@@ -762,7 +762,7 @@ struct acx_statistics {
         struct acx_event_statistics event;
         struct acx_ps_statistics ps;
         struct acx_rxpipe_statistics rxpipe;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_rate_class {
         __le32 enabled_rates;
@@ -780,7 +780,7 @@ struct acx_rate_policy {
 
         __le32 rate_class_cnt;
         struct acx_rate_class rate_class[CONF_TX_MAX_RATE_CLASSES];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_ac_cfg {
         struct acx_header header;
@@ -790,7 +790,7 @@ struct acx_ac_cfg {
         u8 aifsn;
         u8 reserved;
         __le16 tx_op_limit;
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tid_config {
         struct acx_header header;
@@ -801,19 +801,19 @@ struct acx_tid_config {
         u8 ack_policy;
         u8 padding[3];
         __le32 apsd_conf[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_frag_threshold {
         struct acx_header header;
         __le16 frag_threshold;
         u8 padding[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct acx_tx_config_options {
         struct acx_header header;
         __le16 tx_compl_timeout;     /* msec */
         __le16 tx_compl_threshold;   /* number of packets */
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_RX_MEM_BLOCKS     70
 #define ACX_TX_MIN_MEM_BLOCKS 40
@@ -828,7 +828,7 @@ struct wl1271_acx_config_memory {
         u8 num_stations;
         u8 num_ssid_profiles;
         __le32 total_tx_descriptors;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_acx_mem_map {
         struct acx_header header;
@@ -872,7 +872,7 @@ struct wl1271_acx_mem_map {
         u8 *rx_cbuf;
         __le32 rx_ctrl;
         __le32 tx_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_acx_rx_config_opt {
         struct acx_header header;
@@ -882,7 +882,7 @@ struct wl1271_acx_rx_config_opt {
         __le16 timeout;
         u8 queue_type;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct wl1271_acx_bet_enable {
@@ -891,7 +891,7 @@ struct wl1271_acx_bet_enable {
         u8 enable;
         u8 max_consecutive;
         u8 padding[2];
-} __attribute__ ((packed));
+} __packed;
 
 #define ACX_IPV4_VERSION 4
 #define ACX_IPV6_VERSION 6
@@ -905,7 +905,7 @@ struct wl1271_acx_arp_filter {
                                requests directed to this IP address will pass
                                through. For IPv4, the first four bytes are
                                used. */
-} __attribute__((packed));
+} __packed;
 
 struct wl1271_acx_pm_config {
         struct acx_header header;
@@ -913,14 +913,14 @@ struct wl1271_acx_pm_config {
         __le32 host_clk_settling_time;
         u8 host_fast_wakeup_support;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_acx_keep_alive_mode {
         struct acx_header header;
 
         u8 enabled;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         ACX_KEEP_ALIVE_NO_TX = 0,
@@ -940,7 +940,7 @@ struct wl1271_acx_keep_alive_config {
         u8 tpl_validation;
         u8 trigger;
         u8 padding;
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         WL1271_ACX_TRIG_TYPE_LEVEL = 0,
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.h b/drivers/net/wireless/wl12xx/wl1271_cmd.h
index 68001dffe71..f5745d829c9 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.h
@@ -136,14 +136,14 @@ struct wl1271_cmd_header {
         __le16 status;
         /* payload */
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_CMD_MAX_PARAMS 572
 
 struct wl1271_command {
         struct wl1271_cmd_header header;
         u8  parameters[WL1271_CMD_MAX_PARAMS];
-} __attribute__ ((packed));
+} __packed;
 
 enum {
         CMD_MAILBOX_IDLE                =  0,
@@ -196,7 +196,7 @@ struct cmd_read_write_memory {
            of this field is the Host in WRITE command or the Wilink in READ
            command. */
         u8 value[MAX_READ_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define CMDMBOX_HEADER_LEN 4
 #define CMDMBOX_INFO_ELEM_HEADER_LEN 4
@@ -243,14 +243,14 @@ struct wl1271_cmd_join {
         u8 ssid[IW_ESSID_MAX_SIZE];
         u8 ctrl; /* JOIN_CMD_CTRL_* */
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_enabledisable_path {
         struct wl1271_cmd_header header;
 
         u8 channel;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_RATE_AUTOMATIC  0
 
@@ -266,7 +266,7 @@ struct wl1271_cmd_template_set {
         u8 aflags;
         u8 reserved;
         u8 template_data[WL1271_CMD_TEMPL_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define TIM_ELE_ID    5
 #define PARTIAL_VBM_MAX    251
@@ -278,7 +278,7 @@ struct wl1271_tim {
         u8 dtim_period;
         u8 bitmap_ctrl;
         u8 pvb_field[PARTIAL_VBM_MAX]; /* Partial Virtual Bitmap */
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_cmd_ps_mode {
         STATION_ACTIVE_MODE,
@@ -298,7 +298,7 @@ struct wl1271_cmd_ps_params {
           */
         u8 hang_over_period;
         __le32 null_data_rate;
-} __attribute__ ((packed));
+} __packed;
 
 /* HW encryption keys */
 #define NUM_ACCESS_CATEGORIES_COPY 4
@@ -348,7 +348,7 @@ struct wl1271_cmd_set_keys {
         u8 key[MAX_KEY_SIZE];
         __le16 ac_seq_num16[NUM_ACCESS_CATEGORIES_COPY];
         __le32 ac_seq_num32[NUM_ACCESS_CATEGORIES_COPY];
-} __attribute__ ((packed));
+} __packed;
 
 
 #define WL1271_SCAN_MAX_CHANNELS       24
@@ -385,7 +385,7 @@ struct basic_scan_params {
         u8 use_ssid_list;
         u8 scan_tag;
         u8 padding2;
-} __attribute__ ((packed));
+} __packed;
 
 struct basic_scan_channel_params {
         /* Duration in TU to wait for frames on a channel for active scan */
@@ -400,25 +400,25 @@ struct basic_scan_channel_params {
         u8 dfs_candidate;
         u8 activity_detected;
         u8 pad;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_cmd_scan {
         struct wl1271_cmd_header header;
 
         struct basic_scan_params params;
         struct basic_scan_channel_params channels[WL1271_SCAN_MAX_CHANNELS];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_cmd_trigger_scan_to {
         struct wl1271_cmd_header header;
 
         __le32 timeout;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_cmd_test_header {
         u8 id;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_channel_tune_bands {
         WL1271_CHANNEL_TUNE_BAND_2_4,
@@ -447,7 +447,7 @@ struct wl1271_general_parms_cmd {
         u8 sr_sen_nrn;
         u8 sr_sen_prn;
         u8 padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_radio_parms_cmd {
         struct wl1271_cmd_header header;
@@ -463,7 +463,7 @@ struct wl1271_radio_parms_cmd {
         u8 padding2;
         struct wl1271_ini_fem_params_5 dyn_params_5;
         u8 padding3[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_cmd_cal_channel_tune {
         struct wl1271_cmd_header header;
@@ -474,7 +474,7 @@ struct wl1271_cmd_cal_channel_tune {
         u8 channel;
 
         __le16 radio_status;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_cmd_cal_update_ref_point {
         struct wl1271_cmd_header header;
@@ -485,7 +485,7 @@ struct wl1271_cmd_cal_update_ref_point {
         __le32 ref_detector;
         u8  sub_band;
         u8  padding[3];
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_TLV_LENGTH         400
 #define MAX_NVS_VERSION_LENGTH 12
@@ -507,7 +507,7 @@ struct wl1271_cmd_cal_p2g {
 
         u8  sub_band_mask;
         u8  padding2;
-} __attribute__ ((packed));
+} __packed;
 
 
 /*
@@ -535,6 +535,6 @@ struct wl1271_cmd_disconnect {
         u8  type;
 
         u8  padding;
-} __attribute__ ((packed));
+} __packed;
 
 #endif /* __WL1271_CMD_H__ */
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.h b/drivers/net/wireless/wl12xx/wl1271_event.h
index 58371008f27..43d5aeae178 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.h
+++ b/drivers/net/wireless/wl12xx/wl1271_event.h
@@ -85,7 +85,7 @@ struct event_debug_report {
         __le32 report_1;
         __le32 report_2;
         __le32 report_3;
-} __attribute__ ((packed));
+} __packed;
 
 #define NUM_OF_RSSI_SNR_TRIGGERS 8
 
@@ -116,7 +116,7 @@ struct event_mailbox {
         u8 ps_status;
 
         u8 reserved_5[29];
-} __attribute__ ((packed));
+} __packed;
 
 int wl1271_event_unmask(struct wl1271 *wl);
 void wl1271_event_mbox_config(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_ini.h b/drivers/net/wireless/wl12xx/wl1271_ini.h
index 0fb156a5af1..2313047d401 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ini.h
+++ b/drivers/net/wireless/wl12xx/wl1271_ini.h
@@ -39,7 +39,7 @@ struct wl1271_ini_general_params {
         u8 srf1[WL1271_INI_MAX_SMART_REFLEX_PARAM];
         u8 srf2[WL1271_INI_MAX_SMART_REFLEX_PARAM];
         u8 srf3[WL1271_INI_MAX_SMART_REFLEX_PARAM];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_INI_RSSI_PROCESS_COMPENS_SIZE 15
 
@@ -47,7 +47,7 @@ struct wl1271_ini_band_params_2 {
         u8 rx_trace_insertion_loss;
         u8 tx_trace_loss;
         u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_INI_RATE_GROUP_COUNT 6
 #define WL1271_INI_CHANNEL_COUNT_2 14
@@ -66,7 +66,7 @@ struct wl1271_ini_fem_params_2 {
         u8 rx_fem_insertion_loss;
         u8 degraded_low_to_normal_thr;
         u8 normal_to_degraded_high_thr;
-} __attribute__ ((packed));
+} __packed;
 
 #define WL1271_INI_CHANNEL_COUNT_5 35
 #define WL1271_INI_SUB_BAND_COUNT_5 7
@@ -75,7 +75,7 @@ struct wl1271_ini_band_params_5 {
         u8 rx_trace_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
         u8 tx_trace_loss[WL1271_INI_SUB_BAND_COUNT_5];
         u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_ini_fem_params_5 {
         __le16 tx_bip_ref_pd_voltage[WL1271_INI_SUB_BAND_COUNT_5];
@@ -90,7 +90,7 @@ struct wl1271_ini_fem_params_5 {
         u8 rx_fem_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
         u8 degraded_low_to_normal_thr;
         u8 normal_to_degraded_high_thr;
-} __attribute__ ((packed));
+} __packed;
 
 
 /* NVS data structure */
@@ -118,6 +118,6 @@ struct wl1271_nvs_file {
                 struct wl1271_ini_fem_params_5 params;
                 u8 padding;
         } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.h b/drivers/net/wireless/wl12xx/wl1271_rx.h
index b89be4758e7..13a232333b1 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_rx.h
@@ -113,7 +113,7 @@ struct wl1271_rx_descriptor {
         u8  process_id;
         u8  pad_len;
         u8  reserved;
-} __attribute__ ((packed));
+} __packed;
 
 void wl1271_rx(struct wl1271 *wl, struct wl1271_fw_status *status);
 u8 wl1271_rate_to_idx(struct wl1271 *wl, int rate);
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.h b/drivers/net/wireless/wl12xx/wl1271_tx.h
index 0ae00637933..48bf92621c0 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.h
@@ -80,7 +80,7 @@ struct wl1271_tx_hw_descr {
         /* Identifier of the remote STA in IBSS, 1 in infra-BSS */
         u8 aid;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 enum wl1271_tx_hw_res_status {
         TX_SUCCESS          = 0,
@@ -115,13 +115,13 @@ struct wl1271_tx_hw_res_descr {
         u8 rate_class_index;
         /* for 4-byte alignment. */
         u8 spare;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl1271_tx_hw_res_if {
         __le32 tx_result_fw_counter;
         __le32 tx_result_host_counter;
         struct wl1271_tx_hw_res_descr tx_results_queue[TX_HW_RESULT_QUEUE_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 static inline int wl1271_tx_get_queue(int queue)
 {
diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h
index 055d7bc6f59..18462802721 100644
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h
@@ -66,41 +66,41 @@ struct ieee80211_header {
         u8 bssid[ETH_ALEN];
         __le16 seq_ctl;
         u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_header {
         u8 id;
         u8 len;
-} __attribute__ ((packed));
+} __packed;
 
 /* IEs */
 
 struct wl12xx_ie_ssid {
         struct wl12xx_ie_header header;
         char ssid[IW_ESSID_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_rates {
         struct wl12xx_ie_header header;
         u8 rates[MAX_SUPPORTED_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_ds_params {
         struct wl12xx_ie_header header;
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct country_triplet {
         u8 channel;
         u8 num_channels;
         u8 max_tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_country {
         struct wl12xx_ie_header header;
         u8 country_string[COUNTRY_STRING_LEN];
         struct country_triplet triplets[MAX_COUNTRY_TRIPLETS];
-} __attribute__ ((packed));
+} __packed;
 
 
 /* Templates */
@@ -115,30 +115,30 @@ struct wl12xx_beacon_template {
         struct wl12xx_ie_rates ext_rates;
         struct wl12xx_ie_ds_params ds_params;
         struct wl12xx_ie_country country;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_null_data_template {
         struct ieee80211_header header;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ps_poll_template {
         __le16 fc;
         __le16 aid;
         u8 bssid[ETH_ALEN];
         u8 ta[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_qos_null_data_template {
         struct ieee80211_header header;
         __le16 qos_ctl;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_probe_req_template {
         struct ieee80211_header header;
         struct wl12xx_ie_ssid ssid;
         struct wl12xx_ie_rates rates;
         struct wl12xx_ie_rates ext_rates;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct wl12xx_probe_resp_template {
@@ -151,6 +151,6 @@ struct wl12xx_probe_resp_template {
         struct wl12xx_ie_rates ext_rates;
         struct wl12xx_ie_ds_params ds_params;
         struct wl12xx_ie_country country;
-} __attribute__ ((packed));
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index 8816e371fd0..3fbfd19818f 100644
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -231,12 +231,12 @@ struct iw_mgmt_info_element {
                   but sizeof(enum) > sizeof(u8) :-( */
         u8 len;
         u8 data[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_essid_pset {
         struct iw_mgmt_info_element el;
         u8                          essid[IW_ESSID_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * According to 802.11 Wireless Netowors, the definitive guide - O'Reilly
@@ -247,12 +247,12 @@ struct iw_mgmt_essid_pset {
 struct iw_mgmt_data_rset {
         struct iw_mgmt_info_element el;
         u8                          data_rate_labels[IW_DATA_RATE_MAX_LABELS];
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_ds_pset {
         struct iw_mgmt_info_element el;
         u8                          chan;
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_cf_pset {
         struct iw_mgmt_info_element el;
@@ -260,12 +260,12 @@ struct iw_mgmt_cf_pset {
         u8                          cfp_period;
         u16                         cfp_max_duration;
         u16                         cfp_dur_remaining;
-} __attribute__ ((packed));
+} __packed;
 
 struct iw_mgmt_ibss_pset {
         struct iw_mgmt_info_element el;
         u16                         atim_window;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl3501_tx_hdr {
         u16     tx_cnt;
@@ -544,12 +544,12 @@ struct wl3501_80211_tx_plcp_hdr {
         u8      service;
         u16     len;
         u16     crc16;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl3501_80211_tx_hdr {
         struct wl3501_80211_tx_plcp_hdr pclp_hdr;
         struct ieee80211_hdr            mac_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 /*
    Reserve the beginning Tx space for descriptor use.
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index d21739a530e..a6d86b996c7 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -35,7 +35,7 @@ struct zd_ctrlset {
         __le16 current_length;
         u8     service;
         __le16  next_frame_length;
-} __attribute__((packed));
+} __packed;
 
 #define ZD_CS_RESERVED_SIZE     25
 
@@ -106,7 +106,7 @@ struct zd_ctrlset {
 struct rx_length_info {
         __le16 length[3];
         __le16 tag;
-} __attribute__((packed));
+} __packed;
 
 #define RX_LENGTH_INFO_TAG              0x697e
 
@@ -117,7 +117,7 @@ struct rx_status {
         u8 signal_quality_ofdm;
         u8 decryption_type;
         u8 frame_status;
-} __attribute__((packed));
+} __packed;
 
 /* rx_status field decryption_type */
 #define ZD_RX_NO_WEP    0
@@ -153,7 +153,7 @@ struct tx_status {
         u8 mac[ETH_ALEN];
         u8 retry;
         u8 failure;
-} __attribute__((packed));
+} __packed;
 
 enum mac_flags {
         MAC_FIXED_CHANNEL = 0x01,
@@ -226,7 +226,7 @@ enum {
 struct ofdm_plcp_header {
         u8 prefix[3];
         __le16 service;
-} __attribute__((packed));
+} __packed;
 
 static inline u8 zd_ofdm_plcp_header_rate(const struct ofdm_plcp_header *header)
 {
@@ -253,7 +253,7 @@ struct cck_plcp_header {
         u8 service;
         __le16 length;
         __le16 crc16;
-} __attribute__((packed));
+} __packed;
 
 static inline u8 zd_cck_plcp_header_signal(const struct cck_plcp_header *header)
 {
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h
index 049f8b91f02..1b1655cb7cb 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.h
+++ b/drivers/net/wireless/zd1211rw/zd_usb.h
@@ -79,17 +79,17 @@ enum control_requests {
 struct usb_req_read_regs {
         __le16 id;
         __le16 addr[0];
-} __attribute__((packed));
+} __packed;
 
 struct reg_data {
         __le16 addr;
         __le16 value;
-} __attribute__((packed));
+} __packed;
 
 struct usb_req_write_regs {
         __le16 id;
         struct reg_data reg_writes[0];
-} __attribute__((packed));
+} __packed;
 
 enum {
         RF_IF_LE = 0x02,
@@ -106,7 +106,7 @@ struct usb_req_rfwrite {
         /* RF2595: 24 */
         __le16 bit_values[0];
         /* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */
-} __attribute__((packed));
+} __packed;
 
 /* USB interrupt */
 
@@ -123,12 +123,12 @@ enum usb_int_flags {
 struct usb_int_header {
         u8 type;        /* must always be 1 */
         u8 id;
-} __attribute__((packed));
+} __packed;
 
 struct usb_int_regs {
         struct usb_int_header hdr;
         struct reg_data regs[0];
-} __attribute__((packed));
+} __packed;
 
 struct usb_int_retry_fail {
         struct usb_int_header hdr;
@@ -136,7 +136,7 @@ struct usb_int_retry_fail {
         u8 _dummy;
         u8 addr[ETH_ALEN];
         u8 ibss_wakeup_dest;
-} __attribute__((packed));
+} __packed;
 
 struct read_regs_int {
         struct completion completion;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index d504e2b6025..b50fedcef8a 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1621,6 +1621,7 @@ static void backend_changed(struct xenbus_device *dev,
                 if (xennet_connect(netdev) != 0)
                         break;
                 xenbus_switch_state(dev, XenbusStateConnected);
+                netif_notify_peers(netdev);
                 break;
 
         case XenbusStateClosing:
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index a7db68d37ee..d04c5b26205 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -1088,7 +1088,7 @@ static void xemaclite_remove_ndev(struct net_device *ndev)
  */
 static bool get_bool(struct of_device *ofdev, const char *s)
 {
-        u32 *p = (u32 *)of_get_property(ofdev->node, s, NULL);
+        u32 *p = (u32 *)of_get_property(ofdev->dev.of_node, s, NULL);
 
         if (p) {
                 return (bool)*p;
@@ -1130,14 +1130,14 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev,
         dev_info(dev, "Device Tree Probing\n");
 
         /* Get iospace for the device */
-        rc = of_address_to_resource(ofdev->node, 0, &r_mem);
+        rc = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem);
         if (rc) {
                 dev_err(dev, "invalid address\n");
                 return rc;
         }
 
         /* Get IRQ for the device */
-        rc = of_irq_to_resource(ofdev->node, 0, &r_irq);
+        rc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq);
         if (rc == NO_IRQ) {
                 dev_err(dev, "no IRQ found\n");
                 return rc;
@@ -1182,7 +1182,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev,
         lp->next_rx_buf_to_use = 0x0;
         lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
         lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");
-        mac_address = of_get_mac_address(ofdev->node);
+        mac_address = of_get_mac_address(ofdev->dev.of_node);
 
         if (mac_address)
                 /* Set the MAC address. */
@@ -1197,7 +1197,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev,
         /* Set the MAC address in the EmacLite device */
         xemaclite_update_address(lp, ndev->dev_addr);
 
-        lp->phy_node = of_parse_phandle(ofdev->node, "phy-handle", 0);
+        lp->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0);
         rc = xemaclite_mdio_setup(lp, &ofdev->dev);
         if (rc)
                 dev_warn(&ofdev->dev, "error registering MDIO bus\n");
@@ -1291,8 +1291,11 @@ static struct of_device_id xemaclite_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, xemaclite_of_match);
 
 static struct of_platform_driver xemaclite_of_driver = {
-        .name           = DRIVER_NAME,
-        .match_table    = xemaclite_of_match,
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = xemaclite_of_match,
+        },
         .probe          = xemaclite_of_probe,
         .remove         = __devexit_p(xemaclite_of_remove),
 };