Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

71 files changed, 674 insertions, 620 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index b33c099d65a4..0ae0d7c54ccf 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2110,9 +2110,6 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
 
         read_lock(&bond->lock);
 
-        if (bond->kill_timers)
-                goto out;
-
         //check if there are any slaves
         if (bond->slave_cnt == 0)
                 goto re_arm;
@@ -2161,9 +2158,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
         }
 
 re_arm:
-        if (!bond->kill_timers)
-                queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
-out:
+        queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
+
         read_unlock(&bond->lock);
 }
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index d4fbd2e62616..106b88a04738 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1343,10 +1343,6 @@ void bond_alb_monitor(struct work_struct *work)
 
         read_lock(&bond->lock);
 
-        if (bond->kill_timers) {
-                goto out;
-        }
-
         if (bond->slave_cnt == 0) {
                 bond_info->tx_rebalance_counter = 0;
                 bond_info->lp_counter = 0;
@@ -1401,10 +1397,13 @@ void bond_alb_monitor(struct work_struct *work)
 
                         /*
                          * dev_set_promiscuity requires rtnl and
-                         * nothing else.
+                         * nothing else.  Avoid race with bond_close.
                          */
                         read_unlock(&bond->lock);
-                        rtnl_lock();
+                        if (!rtnl_trylock()) {
+                                read_lock(&bond->lock);
+                                goto re_arm;
+                        }
 
                         bond_info->rlb_promisc_timeout_counter = 0;
 
@@ -1440,9 +1439,8 @@ void bond_alb_monitor(struct work_struct *work)
         }
 
 re_arm:
-        if (!bond->kill_timers)
-                queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks);
-out:
+        queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks);
+
         read_unlock(&bond->lock);
 }
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 71efff323941..c34cc1e7c6f6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -395,7 +395,6 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
                         struct net_device *slave_dev)
 {
         skb->dev = slave_dev;
-        skb->priority = 1;
 
         skb->queue_mapping = bond_queue_mapping(skb);
 
@@ -774,9 +773,6 @@ static void bond_resend_igmp_join_requests(struct bonding *bond)
 
         read_lock(&bond->lock);
 
-        if (bond->kill_timers)
-                goto out;
-
         /* rejoin all groups on bond device */
         __bond_resend_igmp_join_requests(bond->dev);
 
@@ -790,9 +786,9 @@ static void bond_resend_igmp_join_requests(struct bonding *bond)
                         __bond_resend_igmp_join_requests(vlan_dev);
         }
 
-        if ((--bond->igmp_retrans > 0) && !bond->kill_timers)
+        if (--bond->igmp_retrans > 0)
                 queue_delayed_work(bond->wq, &bond->mcast_work, HZ/5);
-out:
+
         read_unlock(&bond->lock);
 }
 
@@ -2518,10 +2514,11 @@ void bond_mii_monitor(struct work_struct *work)
         struct bonding *bond = container_of(work, struct bonding,
                                             mii_work.work);
         bool should_notify_peers = false;
+        unsigned long delay;
 
         read_lock(&bond->lock);
-        if (bond->kill_timers)
-                goto out;
+
+        delay = msecs_to_jiffies(bond->params.miimon);
 
         if (bond->slave_cnt == 0)
                 goto re_arm;
@@ -2530,7 +2527,15 @@ void bond_mii_monitor(struct work_struct *work)
 
         if (bond_miimon_inspect(bond)) {
                 read_unlock(&bond->lock);
-                rtnl_lock();
+
+                /* Race avoidance with bond_close cancel of workqueue */
+                if (!rtnl_trylock()) {
+                        read_lock(&bond->lock);
+                        delay = 1;
+                        should_notify_peers = false;
+                        goto re_arm;
+                }
+
                 read_lock(&bond->lock);
 
                 bond_miimon_commit(bond);
@@ -2541,14 +2546,18 @@ void bond_mii_monitor(struct work_struct *work)
         }
 
 re_arm:
-        if (bond->params.miimon && !bond->kill_timers)
-                queue_delayed_work(bond->wq, &bond->mii_work,
-                                   msecs_to_jiffies(bond->params.miimon));
-out:
+        if (bond->params.miimon)
+                queue_delayed_work(bond->wq, &bond->mii_work, delay);
+
         read_unlock(&bond->lock);
 
         if (should_notify_peers) {
-                rtnl_lock();
+                if (!rtnl_trylock()) {
+                        read_lock(&bond->lock);
+                        bond->send_peer_notif++;
+                        read_unlock(&bond->lock);
+                        return;
+                }
                 netdev_bonding_change(bond->dev, NETDEV_NOTIFY_PEERS);
                 rtnl_unlock();
         }
@@ -2790,9 +2799,6 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
 
         delta_in_ticks = msecs_to_jiffies(bond->params.arp_interval);
 
-        if (bond->kill_timers)
-                goto out;
-
         if (bond->slave_cnt == 0)
                 goto re_arm;
 
@@ -2889,9 +2895,9 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
         }
 
 re_arm:
-        if (bond->params.arp_interval && !bond->kill_timers)
+        if (bond->params.arp_interval)
                 queue_delayed_work(bond->wq, &bond->arp_work, delta_in_ticks);
-out:
+
         read_unlock(&bond->lock);
 }
 
@@ -3132,9 +3138,6 @@ void bond_activebackup_arp_mon(struct work_struct *work)
 
         read_lock(&bond->lock);
 
-        if (bond->kill_timers)
-                goto out;
-
         delta_in_ticks = msecs_to_jiffies(bond->params.arp_interval);
 
         if (bond->slave_cnt == 0)
@@ -3144,7 +3147,15 @@ void bond_activebackup_arp_mon(struct work_struct *work)
 
         if (bond_ab_arp_inspect(bond, delta_in_ticks)) {
                 read_unlock(&bond->lock);
-                rtnl_lock();
+
+                /* Race avoidance with bond_close flush of workqueue */
+                if (!rtnl_trylock()) {
+                        read_lock(&bond->lock);
+                        delta_in_ticks = 1;
+                        should_notify_peers = false;
+                        goto re_arm;
+                }
+
                 read_lock(&bond->lock);
 
                 bond_ab_arp_commit(bond, delta_in_ticks);
@@ -3157,13 +3168,18 @@ void bond_activebackup_arp_mon(struct work_struct *work)
         bond_ab_arp_probe(bond);
 
 re_arm:
-        if (bond->params.arp_interval && !bond->kill_timers)
+        if (bond->params.arp_interval)
                 queue_delayed_work(bond->wq, &bond->arp_work, delta_in_ticks);
-out:
+
         read_unlock(&bond->lock);
 
         if (should_notify_peers) {
-                rtnl_lock();
+                if (!rtnl_trylock()) {
+                        read_lock(&bond->lock);
+                        bond->send_peer_notif++;
+                        read_unlock(&bond->lock);
+                        return;
+                }
                 netdev_bonding_change(bond->dev, NETDEV_NOTIFY_PEERS);
                 rtnl_unlock();
         }
@@ -3425,8 +3441,6 @@ static int bond_open(struct net_device *bond_dev)
         struct slave *slave;
         int i;
 
-        bond->kill_timers = 0;
-
         /* reset slave->backup and slave->inactive */
         read_lock(&bond->lock);
         if (bond->slave_cnt > 0) {
@@ -3495,33 +3509,30 @@ static int bond_close(struct net_device *bond_dev)
 
         bond->send_peer_notif = 0;
 
-        /* signal timers not to re-arm */
-        bond->kill_timers = 1;
-
         write_unlock_bh(&bond->lock);
 
         if (bond->params.miimon) {  /* link check interval, in milliseconds. */
-                cancel_delayed_work(&bond->mii_work);
+                cancel_delayed_work_sync(&bond->mii_work);
         }
 
         if (bond->params.arp_interval) {  /* arp interval, in milliseconds. */
-                cancel_delayed_work(&bond->arp_work);
+                cancel_delayed_work_sync(&bond->arp_work);
         }
 
         switch (bond->params.mode) {
         case BOND_MODE_8023AD:
-                cancel_delayed_work(&bond->ad_work);
+                cancel_delayed_work_sync(&bond->ad_work);
                 break;
         case BOND_MODE_TLB:
         case BOND_MODE_ALB:
-                cancel_delayed_work(&bond->alb_work);
+                cancel_delayed_work_sync(&bond->alb_work);
                 break;
         default:
                 break;
         }
 
         if (delayed_work_pending(&bond->mcast_work))
-                cancel_delayed_work(&bond->mcast_work);
+                cancel_delayed_work_sync(&bond->mcast_work);
 
         if (bond_is_lb(bond)) {
                 /* Must be called only after all
@@ -4368,26 +4379,22 @@ static void bond_setup(struct net_device *bond_dev)
 
 static void bond_work_cancel_all(struct bonding *bond)
 {
-        write_lock_bh(&bond->lock);
-        bond->kill_timers = 1;
-        write_unlock_bh(&bond->lock);
-
         if (bond->params.miimon && delayed_work_pending(&bond->mii_work))
-                cancel_delayed_work(&bond->mii_work);
+                cancel_delayed_work_sync(&bond->mii_work);
 
         if (bond->params.arp_interval && delayed_work_pending(&bond->arp_work))
-                cancel_delayed_work(&bond->arp_work);
+                cancel_delayed_work_sync(&bond->arp_work);
 
         if (bond->params.mode == BOND_MODE_ALB &&
             delayed_work_pending(&bond->alb_work))
-                cancel_delayed_work(&bond->alb_work);
+                cancel_delayed_work_sync(&bond->alb_work);
 
         if (bond->params.mode == BOND_MODE_8023AD &&
             delayed_work_pending(&bond->ad_work))
-                cancel_delayed_work(&bond->ad_work);
+                cancel_delayed_work_sync(&bond->ad_work);
 
         if (delayed_work_pending(&bond->mcast_work))
-                cancel_delayed_work(&bond->mcast_work);
+                cancel_delayed_work_sync(&bond->mcast_work);
 }
 
 /*
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 82fec5fc75d7..1aecc37e5b4d 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -222,7 +222,6 @@ struct bonding {
                                struct slave *);
         rwlock_t lock;
         rwlock_t curr_slave_lock;
-        s8       kill_timers;
         u8       send_peer_notif;
         s8       setup_by_slave;
         s8       igmp_retrans;
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index cee6ba2b8b58..c3dd9d09be57 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -29,7 +29,7 @@
  *           nxp,external-clock-frequency = <16000000>;
  *   };
  *
- * See "Documentation/powerpc/dts-bindings/can/sja1000.txt" for further
+ * See "Documentation/devicetree/bindings/net/can/sja1000.txt" for further
  * information.
  */
 
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 0405261efb5c..33a4e35f5ee8 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -858,7 +858,7 @@ static s32 atl1_init_hw(struct atl1_hw *hw)
         atl1_init_flash_opcode(hw);
 
         if (!hw->phy_configured) {
-                /* enable GPHY LinkChange Interrrupt */
+                /* enable GPHY LinkChange Interrupt */
                 ret_val = atl1_write_phy_reg(hw, 18, 0xC00);
                 if (ret_val)
                         return ret_val;
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
index fc50d4267df8..99d31a7d6aaa 100644
--- a/drivers/net/ethernet/broadcom/bnx2.h
+++ b/drivers/net/ethernet/broadcom/bnx2.h
@@ -5617,7 +5617,7 @@ struct l2_fhdr {
 #define BNX2_TXP_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
 #define BNX2_TXP_CPU_STATE_SOFT_HALTED                   (1L<<10)
 #define BNX2_TXP_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
-#define BNX2_TXP_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_TXP_CPU_STATE_INTERRUPT                     (1L<<12)
 #define BNX2_TXP_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
 #define BNX2_TXP_CPU_STATE_INST_FETCH_STALL              (1L<<15)
 #define BNX2_TXP_CPU_STATE_BLOCKED_READ                  (1L<<31)
@@ -5712,7 +5712,7 @@ struct l2_fhdr {
 #define BNX2_TPAT_CPU_STATE_FIO_ABORT_HALTED             (1L<<8)
 #define BNX2_TPAT_CPU_STATE_SOFT_HALTED                  (1L<<10)
 #define BNX2_TPAT_CPU_STATE_SPAD_UNDERFLOW               (1L<<11)
-#define BNX2_TPAT_CPU_STATE_INTERRRUPT                   (1L<<12)
+#define BNX2_TPAT_CPU_STATE_INTERRUPT                    (1L<<12)
 #define BNX2_TPAT_CPU_STATE_DATA_ACCESS_STALL            (1L<<14)
 #define BNX2_TPAT_CPU_STATE_INST_FETCH_STALL             (1L<<15)
 #define BNX2_TPAT_CPU_STATE_BLOCKED_READ                 (1L<<31)
@@ -5807,7 +5807,7 @@ struct l2_fhdr {
 #define BNX2_RXP_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
 #define BNX2_RXP_CPU_STATE_SOFT_HALTED                   (1L<<10)
 #define BNX2_RXP_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
-#define BNX2_RXP_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_RXP_CPU_STATE_INTERRUPT                     (1L<<12)
 #define BNX2_RXP_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
 #define BNX2_RXP_CPU_STATE_INST_FETCH_STALL              (1L<<15)
 #define BNX2_RXP_CPU_STATE_BLOCKED_READ                  (1L<<31)
@@ -5953,7 +5953,7 @@ struct l2_fhdr {
 #define BNX2_COM_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
 #define BNX2_COM_CPU_STATE_SOFT_HALTED                   (1L<<10)
 #define BNX2_COM_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
-#define BNX2_COM_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_COM_CPU_STATE_INTERRUPT                     (1L<<12)
 #define BNX2_COM_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
 #define BNX2_COM_CPU_STATE_INST_FETCH_STALL              (1L<<15)
 #define BNX2_COM_CPU_STATE_BLOCKED_READ                  (1L<<31)
@@ -6119,7 +6119,7 @@ struct l2_fhdr {
 #define BNX2_CP_CPU_STATE_FIO_ABORT_HALTED               (1L<<8)
 #define BNX2_CP_CPU_STATE_SOFT_HALTED                    (1L<<10)
 #define BNX2_CP_CPU_STATE_SPAD_UNDERFLOW                 (1L<<11)
-#define BNX2_CP_CPU_STATE_INTERRRUPT                     (1L<<12)
+#define BNX2_CP_CPU_STATE_INTERRUPT                      (1L<<12)
 #define BNX2_CP_CPU_STATE_DATA_ACCESS_STALL              (1L<<14)
 #define BNX2_CP_CPU_STATE_INST_FETCH_STALL               (1L<<15)
 #define BNX2_CP_CPU_STATE_BLOCKED_READ                   (1L<<31)
@@ -6291,7 +6291,7 @@ struct l2_fhdr {
 #define BNX2_MCP_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
 #define BNX2_MCP_CPU_STATE_SOFT_HALTED                   (1L<<10)
 #define BNX2_MCP_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
-#define BNX2_MCP_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_MCP_CPU_STATE_INTERRUPT                     (1L<<12)
 #define BNX2_MCP_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
 #define BNX2_MCP_CPU_STATE_INST_FETCH_STALL              (1L<<15)
 #define BNX2_MCP_CPU_STATE_BLOCKED_READ                  (1L<<31)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 627a5807836d..aec7212ac983 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -23,8 +23,8 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.70.00-0"
-#define DRV_MODULE_RELDATE      "2011/06/13"
+#define DRV_MODULE_VERSION      "1.70.30-0"
+#define DRV_MODULE_RELDATE      "2011/10/25"
 #define BNX2X_BC_VER            0x040200
 
 #if defined(CONFIG_DCB)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 1a6e37ce730c..f0ca8b27a55e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -329,6 +329,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                         PORT_HW_CFG_PHY_SELECTION_FIRST_PHY;
                 break;
         case PORT_FIBRE:
+        case PORT_DA:
                 if (bp->port.supported[cfg_idx] & SUPPORTED_FIBRE)
                         break; /* no port change */
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index e44b858ff12f..fc754cb6cc0f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -2550,7 +2550,7 @@ struct host_func_stats {
 
 #define BCM_5710_FW_MAJOR_VERSION                       7
 #define BCM_5710_FW_MINOR_VERSION                       0
-#define BCM_5710_FW_REVISION_VERSION            23
+#define BCM_5710_FW_REVISION_VERSION            29
 #define BCM_5710_FW_ENGINEERING_VERSION         0
 #define BCM_5710_FW_COMPILE_FLAGS                       1
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 818723c9e678..bce203fa4b9e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -45,6 +45,9 @@
 #define MCPR_IMC_COMMAND_READ_OP        1
 #define MCPR_IMC_COMMAND_WRITE_OP       2
 
+/* LED Blink rate that will achieve ~15.9Hz */
+#define LED_BLINK_RATE_VAL_E3           354
+#define LED_BLINK_RATE_VAL_E1X_E2       480
 /***********************************************************/
 /*                      Shortcut definitions               */
 /***********************************************************/
@@ -258,6 +261,7 @@
 
 #define MAX_PACKET_SIZE                                 (9700)
 #define WC_UC_TIMEOUT                                   100
+#define MAX_KR_LINK_RETRY                               4
 
 /**********************************************************/
 /*                     INTERFACE                          */
@@ -1490,6 +1494,18 @@ static void bnx2x_set_xumac_nig(struct link_params *params,
                NIG_REG_P0_MAC_PAUSE_OUT_EN, tx_pause_en);
 }
 
+static void bnx2x_umac_disable(struct link_params *params)
+{
+        u32 umac_base = params->port ? GRCBASE_UMAC1 : GRCBASE_UMAC0;
+        struct bnx2x *bp = params->bp;
+        if (!(REG_RD(bp, MISC_REG_RESET_REG_2) &
+                   (MISC_REGISTERS_RESET_REG_2_UMAC0 << params->port)))
+                return;
+
+        /* Disable RX and TX */
+        REG_WR(bp, umac_base + UMAC_REG_COMMAND_CONFIG, 0);
+}
+
 static void bnx2x_umac_enable(struct link_params *params,
                             struct link_vars *vars, u8 lb)
 {
@@ -1599,8 +1615,9 @@ static u8 bnx2x_is_4_port_mode(struct bnx2x *bp)
 }
 
 /* Define the XMAC mode */
-static void bnx2x_xmac_init(struct bnx2x *bp, u32 max_speed)
+static void bnx2x_xmac_init(struct link_params *params, u32 max_speed)
 {
+        struct bnx2x *bp = params->bp;
         u32 is_port4mode = bnx2x_is_4_port_mode(bp);
 
         /**
@@ -1610,7 +1627,8 @@ static void bnx2x_xmac_init(struct bnx2x *bp, u32 max_speed)
         * ports of the path
         **/
 
-        if (is_port4mode && (REG_RD(bp, MISC_REG_RESET_REG_2) &
+        if ((CHIP_NUM(bp) == CHIP_NUM_57840) &&
+            (REG_RD(bp, MISC_REG_RESET_REG_2) &
              MISC_REGISTERS_RESET_REG_2_XMAC)) {
                 DP(NETIF_MSG_LINK,
                    "XMAC already out of reset in 4-port mode\n");
@@ -1677,10 +1695,6 @@ static void bnx2x_xmac_disable(struct link_params *params)
                        (pfc_ctrl | (1<<1)));
                 DP(NETIF_MSG_LINK, "Disable XMAC on port %x\n", port);
                 REG_WR(bp, xmac_base + XMAC_REG_CTRL, 0);
-                usleep_range(1000, 1000);
-                bnx2x_set_xumac_nig(params, 0, 0);
-                REG_WR(bp, xmac_base + XMAC_REG_CTRL,
-                       XMAC_CTRL_REG_SOFT_RESET);
         }
 }
 
@@ -1693,7 +1707,7 @@ static int bnx2x_xmac_enable(struct link_params *params,
 
         xmac_base = (params->port) ? GRCBASE_XMAC1 : GRCBASE_XMAC0;
 
-        bnx2x_xmac_init(bp, vars->line_speed);
+        bnx2x_xmac_init(params, vars->line_speed);
 
         /*
          * This register determines on which events the MAC will assert
@@ -3575,6 +3589,11 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
         u16 val16 = 0, lane, bam37 = 0;
         struct bnx2x *bp = params->bp;
         DP(NETIF_MSG_LINK, "Enable Auto Negotiation for KR\n");
+
+        /* Disable Autoneg: re-enable it after adv is done. */
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0);
+
         /* Check adding advertisement for 1G KX */
         if (((vars->line_speed == SPEED_AUTO_NEG) &&
              (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)) ||
@@ -3616,9 +3635,6 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_CL72_USERB0_CL72_2P5_DEF_CTRL,
                          0x03f0);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL,
-                         0x383f);
 
         /* Advertised speeds */
         bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
@@ -3645,19 +3661,22 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
         /* Advertise pause */
         bnx2x_ext_phy_set_pause(params, phy, vars);
 
-        /* Enable Autoneg */
-        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
-                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x1000);
-
-        /* Over 1G - AN local device user page 1 */
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_DIGITAL3_UP1, 0x1f);
+        vars->rx_tx_asic_rst = MAX_KR_LINK_RETRY;
 
         bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
                         MDIO_WC_REG_DIGITAL5_MISC7, &val16);
 
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_DIGITAL5_MISC7, val16 | 0x100);
+
+        /* Over 1G - AN local device user page 1 */
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                        MDIO_WC_REG_DIGITAL3_UP1, 0x1f);
+
+        /* Enable Autoneg */
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x1000);
+
 }
 
 static void bnx2x_warpcore_set_10G_KR(struct bnx2x_phy *phy,
@@ -4126,6 +4145,85 @@ static int bnx2x_is_sfp_module_plugged(struct bnx2x_phy *phy,
         else
                 return 0;
 }
+static int bnx2x_warpcore_get_sigdet(struct bnx2x_phy *phy,
+                                        struct link_params *params)
+{
+        u16 gp2_status_reg0, lane;
+        struct bnx2x *bp = params->bp;
+
+        lane = bnx2x_get_warpcore_lane(phy, params);
+
+        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, MDIO_WC_REG_GP2_STATUS_GP_2_0,
+                                 &gp2_status_reg0);
+
+        return (gp2_status_reg0 >> (8+lane)) & 0x1;
+}
+
+static void bnx2x_warpcore_config_runtime(struct bnx2x_phy *phy,
+                                       struct link_params *params,
+                                       struct link_vars *vars)
+{
+        struct bnx2x *bp = params->bp;
+        u32 serdes_net_if;
+        u16 gp_status1 = 0, lnkup = 0, lnkup_kr = 0;
+        u16 lane = bnx2x_get_warpcore_lane(phy, params);
+
+        vars->turn_to_run_wc_rt = vars->turn_to_run_wc_rt ? 0 : 1;
+
+        if (!vars->turn_to_run_wc_rt)
+                return;
+
+        /* return if there is no link partner */
+        if (!(bnx2x_warpcore_get_sigdet(phy, params))) {
+                DP(NETIF_MSG_LINK, "bnx2x_warpcore_get_sigdet false\n");
+                return;
+        }
+
+        if (vars->rx_tx_asic_rst) {
+                serdes_net_if = (REG_RD(bp, params->shmem_base +
+                                offsetof(struct shmem_region, dev_info.
+                                port_hw_config[params->port].default_cfg)) &
+                                PORT_HW_CFG_NET_SERDES_IF_MASK);
+
+                switch (serdes_net_if) {
+                case PORT_HW_CFG_NET_SERDES_IF_KR:
+                        /* Do we get link yet? */
+                        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, 0x81d1,
+                                                                &gp_status1);
+                        lnkup = (gp_status1 >> (8+lane)) & 0x1;/* 1G */
+                                /*10G KR*/
+                        lnkup_kr = (gp_status1 >> (12+lane)) & 0x1;
+
+                        DP(NETIF_MSG_LINK,
+                                "gp_status1 0x%x\n", gp_status1);
+
+                        if (lnkup_kr || lnkup) {
+                                        vars->rx_tx_asic_rst = 0;
+                                        DP(NETIF_MSG_LINK,
+                                        "link up, rx_tx_asic_rst 0x%x\n",
+                                        vars->rx_tx_asic_rst);
+                        } else {
+                                /*reset the lane to see if link comes up.*/
+                                bnx2x_warpcore_reset_lane(bp, phy, 1);
+                                bnx2x_warpcore_reset_lane(bp, phy, 0);
+
+                                /* restart Autoneg */
+                                bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x1200);
+
+                                vars->rx_tx_asic_rst--;
+                                DP(NETIF_MSG_LINK, "0x%x retry left\n",
+                                vars->rx_tx_asic_rst);
+                        }
+                        break;
+
+                default:
+                        break;
+                }
+
+        } /*params->rx_tx_asic_rst*/
+
+}
 
 static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,
                                        struct link_params *params,
@@ -5896,7 +5994,13 @@ int bnx2x_set_led(struct link_params *params,
                        SHARED_HW_CFG_LED_MAC1);
 
                 tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp | EMAC_LED_OVERRIDE));
+                if (params->phy[EXT_PHY1].type ==
+                          PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE)
+                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp & 0xfff1);
+                else {
+                        EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                                (tmp | EMAC_LED_OVERRIDE));
+                }
                 break;
 
         case LED_MODE_OPER:
@@ -5949,17 +6053,33 @@ int bnx2x_set_led(struct link_params *params,
                         else
                                 REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
                                        hw_led_mode);
+                } else if ((params->phy[EXT_PHY1].type ==
+                            PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&
+                           (mode != LED_MODE_OPER)) {
+                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
+                        tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
+                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp | 0x3);
                 } else
-                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, hw_led_mode);
+                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
+                               hw_led_mode);
 
                 REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 + port*4, 0);
                 /* Set blinking rate to ~15.9Hz */
-                REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_P0 + port*4,
-                       LED_BLINK_RATE_VAL);
+                if (CHIP_IS_E3(bp))
+                        REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_P0 + port*4,
+                               LED_BLINK_RATE_VAL_E3);
+                else
+                        REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_P0 + port*4,
+                               LED_BLINK_RATE_VAL_E1X_E2);
                 REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 +
                        port*4, 1);
-                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp & (~EMAC_LED_OVERRIDE)));
+                if ((params->phy[EXT_PHY1].type !=
+                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&
+                    (mode != LED_MODE_OPER)) {
+                        tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
+                        EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                                (tmp & (~EMAC_LED_OVERRIDE)));
+                }
 
                 if (CHIP_IS_E1(bp) &&
                     ((speed == SPEED_2500) ||
@@ -6218,8 +6338,10 @@ static int bnx2x_update_link_down(struct link_params *params,
                        MISC_REGISTERS_RESET_REG_2_CLEAR,
                (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
         }
-        if (CHIP_IS_E3(bp))
+        if (CHIP_IS_E3(bp)) {
                 bnx2x_xmac_disable(params);
+                bnx2x_umac_disable(params);
+        }
 
         return 0;
 }
@@ -10205,22 +10327,6 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
         return 0;
 }
 
-static void bnx2x_54618se_set_link_led(struct bnx2x_phy *phy,
-                                       struct link_params *params, u8 mode)
-{
-        struct bnx2x *bp = params->bp;
-        DP(NETIF_MSG_LINK, "54618SE set link led (mode=%x)\n", mode);
-        switch (mode) {
-        case LED_MODE_FRONT_PANEL_OFF:
-        case LED_MODE_OFF:
-        case LED_MODE_OPER:
-        case LED_MODE_ON:
-        default:
-                break;
-        }
-        return;
-}
-
 static void bnx2x_54618se_link_reset(struct bnx2x_phy *phy,
                                      struct link_params *params)
 {
@@ -10997,7 +11103,7 @@ static struct bnx2x_phy phy_54618se = {
         .config_loopback = (config_loopback_t)bnx2x_54618se_config_loopback,
         .format_fw_ver  = (format_fw_ver_t)NULL,
         .hw_reset       = (hw_reset_t)NULL,
-        .set_link_led   = (set_link_led_t)bnx2x_54618se_set_link_led,
+        .set_link_led   = (set_link_led_t)NULL,
         .phy_specific_func = (phy_specific_func_t)NULL
 };
 /*****************************************************************/
@@ -11718,8 +11824,10 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
         /* Stop BigMac rx */
         if (!CHIP_IS_E3(bp))
                 bnx2x_bmac_rx_disable(bp, port);
-        else
+        else {
                 bnx2x_xmac_disable(params);
+                bnx2x_umac_disable(params);
+        }
         /* disable emac */
         if (!CHIP_IS_E3(bp))
                 REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
@@ -11757,14 +11865,21 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
         if (params->phy[INT_PHY].link_reset)
                 params->phy[INT_PHY].link_reset(
                         &params->phy[INT_PHY], params);
-        /* reset BigMac */
-        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-               (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
 
         /* disable nig ingress interface */
         if (!CHIP_IS_E3(bp)) {
+                /* reset BigMac */
+                REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
+                       (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
                 REG_WR(bp, NIG_REG_BMAC0_IN_EN + port*4, 0);
                 REG_WR(bp, NIG_REG_EMAC0_IN_EN + port*4, 0);
+        } else {
+                u32 xmac_base = (params->port) ? GRCBASE_XMAC1 : GRCBASE_XMAC0;
+                bnx2x_set_xumac_nig(params, 0, 0);
+                if (REG_RD(bp, MISC_REG_RESET_REG_2) &
+                    MISC_REGISTERS_RESET_REG_2_XMAC)
+                        REG_WR(bp, xmac_base + XMAC_REG_CTRL,
+                               XMAC_CTRL_REG_SOFT_RESET);
         }
         vars->link_up = 0;
         vars->phy_flags = 0;
@@ -12332,11 +12447,6 @@ void bnx2x_period_func(struct link_params *params, struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
         u16 phy_idx;
-        if (!params) {
-                DP(NETIF_MSG_LINK, "Uninitialized params !\n");
-                return;
-        }
-
         for (phy_idx = INT_PHY; phy_idx < MAX_PHYS; phy_idx++) {
                 if (params->phy[phy_idx].flags & FLAGS_TX_ERROR_CHECK) {
                         bnx2x_set_aer_mmd(params, &params->phy[phy_idx]);
@@ -12345,8 +12455,13 @@ void bnx2x_period_func(struct link_params *params, struct link_vars *vars)
                 }
         }
 
-        if (CHIP_IS_E3(bp))
+        if (CHIP_IS_E3(bp)) {
+                struct bnx2x_phy *phy = &params->phy[INT_PHY];
+                bnx2x_set_aer_mmd(params, phy);
                 bnx2x_check_over_curr(params, vars);
+                bnx2x_warpcore_config_runtime(phy, params, vars);
+        }
+
 }
 
 u8 bnx2x_hw_lock_required(struct bnx2x *bp, u32 shmem_base, u32 shmem2_base)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index c12db6da213e..2a46e633abe9 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -303,6 +303,9 @@ struct link_vars {
 #define PERIODIC_FLAGS_LINK_EVENT       0x0001
 
         u32 aeu_int_mask;
+        u8 rx_tx_asic_rst;
+        u8 turn_to_run_wc_rt;
+        u16 rsrv2;
 };
 
 /***********************************************************/
diff --git a/drivers/net/ethernet/dec/tulip/21142.c b/drivers/net/ethernet/dec/tulip/21142.c
index 092c3faa882a..25b8deedbef8 100644
--- a/drivers/net/ethernet/dec/tulip/21142.c
+++ b/drivers/net/ethernet/dec/tulip/21142.c
@@ -7,9 +7,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
-
         DC21143 manual "21143 PCI/CardBus 10/100Mb/s Ethernet LAN Controller
         Hardware Reference Manual" is currently available at :
         http://developer.intel.com/design/network/manuals/278074.htm
diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
index fa5eee925f25..14d5b611783d 100644
--- a/drivers/net/ethernet/dec/tulip/eeprom.c
+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
@@ -7,8 +7,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
         Please submit bug reports to http://bugzilla.kernel.org/.
 */
 
diff --git a/drivers/net/ethernet/dec/tulip/interrupt.c b/drivers/net/ethernet/dec/tulip/interrupt.c
index 5350d753e0ff..4fb8c8c0a420 100644
--- a/drivers/net/ethernet/dec/tulip/interrupt.c
+++ b/drivers/net/ethernet/dec/tulip/interrupt.c
@@ -7,10 +7,7 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
         Please submit bugs to http://bugzilla.kernel.org/ .
-
 */
 
 #include <linux/pci.h>
diff --git a/drivers/net/ethernet/dec/tulip/media.c b/drivers/net/ethernet/dec/tulip/media.c
index 4bd13922875d..beeb17b52ad4 100644
--- a/drivers/net/ethernet/dec/tulip/media.c
+++ b/drivers/net/ethernet/dec/tulip/media.c
@@ -7,9 +7,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
-
         Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
diff --git a/drivers/net/ethernet/dec/tulip/pnic.c b/drivers/net/ethernet/dec/tulip/pnic.c
index 52d898bdbeb4..9c16e4ad02a6 100644
--- a/drivers/net/ethernet/dec/tulip/pnic.c
+++ b/drivers/net/ethernet/dec/tulip/pnic.c
@@ -7,9 +7,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
-
         Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
diff --git a/drivers/net/ethernet/dec/tulip/pnic2.c b/drivers/net/ethernet/dec/tulip/pnic2.c
index 93358ee4d830..04a7e477eaff 100644
--- a/drivers/net/ethernet/dec/tulip/pnic2.c
+++ b/drivers/net/ethernet/dec/tulip/pnic2.c
@@ -8,9 +8,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
-
         Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
diff --git a/drivers/net/ethernet/dec/tulip/timer.c b/drivers/net/ethernet/dec/tulip/timer.c
index 2017faf2d0e6..19078d28ffb9 100644
--- a/drivers/net/ethernet/dec/tulip/timer.c
+++ b/drivers/net/ethernet/dec/tulip/timer.c
@@ -7,9 +7,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
-
         Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
diff --git a/drivers/net/ethernet/dec/tulip/tulip.h b/drivers/net/ethernet/dec/tulip/tulip.h
index 9db528967da9..fb3887c18dc6 100644
--- a/drivers/net/ethernet/dec/tulip/tulip.h
+++ b/drivers/net/ethernet/dec/tulip/tulip.h
@@ -7,9 +7,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
-
         Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 011f67c7ca47..9656dd0647d9 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -6,9 +6,6 @@
         This software may be used and distributed according to the terms
         of the GNU General Public License, incorporated herein by reference.
 
-        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-        for more information on this driver.
-
         Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index e0ff96193c49..824b8e6021f6 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -428,28 +428,33 @@ static inline struct be_sge *nonembedded_sgl(struct be_mcc_wrb *wrb)
         return &wrb->payload.sgl[0];
 }
 
-/* Don't touch the hdr after it's prepared */
-static void be_wrb_hdr_prepare(struct be_mcc_wrb *wrb, int payload_len,
-                                bool embedded, u8 sge_cnt, u32 opcode)
-{
-        if (embedded)
-                wrb->embedded |= MCC_WRB_EMBEDDED_MASK;
-        else
-                wrb->embedded |= (sge_cnt & MCC_WRB_SGE_CNT_MASK) <<
-                                MCC_WRB_SGE_CNT_SHIFT;
-        wrb->payload_length = payload_len;
-        wrb->tag0 = opcode;
-        be_dws_cpu_to_le(wrb, 8);
-}
 
 /* Don't touch the hdr after it's prepared */
-static void be_cmd_hdr_prepare(struct be_cmd_req_hdr *req_hdr,
-                                u8 subsystem, u8 opcode, int cmd_len)
+/* mem will be NULL for embedded commands */
+static void be_wrb_cmd_hdr_prepare(struct be_cmd_req_hdr *req_hdr,
+                                u8 subsystem, u8 opcode, int cmd_len,
+                                struct be_mcc_wrb *wrb, struct be_dma_mem *mem)
 {
+        struct be_sge *sge;
+
         req_hdr->opcode = opcode;
         req_hdr->subsystem = subsystem;
         req_hdr->request_length = cpu_to_le32(cmd_len - sizeof(*req_hdr));
         req_hdr->version = 0;
+
+        wrb->tag0 = opcode;
+        wrb->tag1 = subsystem;
+        wrb->payload_length = cmd_len;
+        if (mem) {
+                wrb->embedded |= (1 & MCC_WRB_SGE_CNT_MASK) <<
+                        MCC_WRB_SGE_CNT_SHIFT;
+                sge = nonembedded_sgl(wrb);
+                sge->pa_hi = cpu_to_le32(upper_32_bits(mem->dma));
+                sge->pa_lo = cpu_to_le32(mem->dma & 0xFFFFFFFF);
+                sge->len = cpu_to_le32(mem->size);
+        } else
+                wrb->embedded |= MCC_WRB_EMBEDDED_MASK;
+        be_dws_cpu_to_le(wrb, 8);
 }
 
 static void be_cmd_page_addrs_prepare(struct phys_addr *pages, u32 max_pages,
@@ -586,10 +591,8 @@ int be_cmd_eq_create(struct be_adapter *adapter,
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0, OPCODE_COMMON_EQ_CREATE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_EQ_CREATE, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_EQ_CREATE, sizeof(*req), wrb, NULL);
 
         req->num_pages =  cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
 
@@ -632,12 +635,8 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_NTWK_MAC_QUERY);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_MAC_QUERY, sizeof(*req));
-
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_MAC_QUERY, sizeof(*req), wrb, NULL);
         req->type = type;
         if (permanent) {
                 req->permanent = 1;
@@ -674,11 +673,8 @@ int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_NTWK_PMAC_ADD);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_PMAC_ADD, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_PMAC_ADD, sizeof(*req), wrb, NULL);
 
         req->hdr.domain = domain;
         req->if_id = cpu_to_le32(if_id);
@@ -692,6 +688,10 @@ int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
 
 err:
         spin_unlock_bh(&adapter->mcc_lock);
+
+         if (status == MCC_STATUS_UNAUTHORIZED_REQUEST)
+                status = -EPERM;
+
         return status;
 }
 
@@ -711,11 +711,8 @@ int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id, u32 dom)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_NTWK_PMAC_DEL);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req), wrb, NULL);
 
         req->hdr.domain = dom;
         req->if_id = cpu_to_le32(if_id);
@@ -746,11 +743,8 @@ int be_cmd_cq_create(struct be_adapter *adapter,
         req = embedded_payload(wrb);
         ctxt = &req->context;
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_CQ_CREATE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_CQ_CREATE, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_CQ_CREATE, sizeof(*req), wrb, NULL);
 
         req->num_pages =  cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
         if (lancer_chip(adapter)) {
@@ -822,11 +816,8 @@ int be_cmd_mccq_ext_create(struct be_adapter *adapter,
         req = embedded_payload(wrb);
         ctxt = &req->context;
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_MCC_CREATE_EXT);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                        OPCODE_COMMON_MCC_CREATE_EXT, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                        OPCODE_COMMON_MCC_CREATE_EXT, sizeof(*req), wrb, NULL);
 
         req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
         if (lancer_chip(adapter)) {
@@ -882,11 +873,8 @@ int be_cmd_mccq_org_create(struct be_adapter *adapter,
         req = embedded_payload(wrb);
         ctxt = &req->context;
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_MCC_CREATE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                        OPCODE_COMMON_MCC_CREATE, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                        OPCODE_COMMON_MCC_CREATE, sizeof(*req), wrb, NULL);
 
         req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
 
@@ -943,11 +931,8 @@ int be_cmd_txq_create(struct be_adapter *adapter,
         req = embedded_payload(wrb);
         ctxt = &req->context;
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_ETH_TX_CREATE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH, OPCODE_ETH_TX_CREATE,
-                sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
+                OPCODE_ETH_TX_CREATE, sizeof(*req), wrb, NULL);
 
         if (lancer_chip(adapter)) {
                 req->hdr.version = 1;
@@ -999,11 +984,8 @@ int be_cmd_rxq_create(struct be_adapter *adapter,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_ETH_RX_CREATE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH, OPCODE_ETH_RX_CREATE,
-                sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
+                                OPCODE_ETH_RX_CREATE, sizeof(*req), wrb, NULL);
 
         req->cq_id = cpu_to_le16(cq_id);
         req->frag_size = fls(frag_size) - 1;
@@ -1071,9 +1053,8 @@ int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,
                 BUG();
         }
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0, opcode);
-
-        be_cmd_hdr_prepare(&req->hdr, subsys, opcode, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, subsys, opcode, sizeof(*req), wrb,
+                                NULL);
         req->id = cpu_to_le16(q->id);
 
         status = be_mbox_notify_wait(adapter);
@@ -1100,9 +1081,8 @@ int be_cmd_rxq_destroy(struct be_adapter *adapter, struct be_queue_info *q)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0, OPCODE_ETH_RX_DESTROY);
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH, OPCODE_ETH_RX_DESTROY,
-                sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
+                        OPCODE_ETH_RX_DESTROY, sizeof(*req), wrb, NULL);
         req->id = cpu_to_le16(q->id);
 
         status = be_mcc_notify_wait(adapter);
@@ -1133,12 +1113,8 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_NTWK_INTERFACE_CREATE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_INTERFACE_CREATE, sizeof(*req));
-
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_INTERFACE_CREATE, sizeof(*req), wrb, NULL);
         req->hdr.domain = domain;
         req->capability_flags = cpu_to_le32(cap_flags);
         req->enable_flags = cpu_to_le32(en_flags);
@@ -1182,12 +1158,8 @@ int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id, u32 domain)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_NTWK_INTERFACE_DESTROY);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_INTERFACE_DESTROY, sizeof(*req));
-
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_INTERFACE_DESTROY, sizeof(*req), wrb, NULL);
         req->hdr.domain = domain;
         req->interface_id = cpu_to_le32(interface_id);
 
@@ -1205,7 +1177,6 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_hdr *hdr;
-        struct be_sge *sge;
         int status = 0;
 
         if (MODULO(adapter->work_counter, be_get_temp_freq) == 0)
@@ -1219,22 +1190,13 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
                 goto err;
         }
         hdr = nonemb_cmd->va;
-        sge = nonembedded_sgl(wrb);
-
-        be_wrb_hdr_prepare(wrb, nonemb_cmd->size, false, 1,
-                        OPCODE_ETH_GET_STATISTICS);
 
-        be_cmd_hdr_prepare(hdr, CMD_SUBSYSTEM_ETH,
-                OPCODE_ETH_GET_STATISTICS, nonemb_cmd->size);
+        be_wrb_cmd_hdr_prepare(hdr, CMD_SUBSYSTEM_ETH,
+                OPCODE_ETH_GET_STATISTICS, nonemb_cmd->size, wrb, nonemb_cmd);
 
         if (adapter->generation == BE_GEN3)
                 hdr->version = 1;
 
-        wrb->tag1 = CMD_SUBSYSTEM_ETH;
-        sge->pa_hi = cpu_to_le32(upper_32_bits(nonemb_cmd->dma));
-        sge->pa_lo = cpu_to_le32(nonemb_cmd->dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(nonemb_cmd->size);
-
         be_mcc_notify(adapter);
         adapter->stats_cmd_sent = true;
 
@@ -1250,7 +1212,6 @@ int lancer_cmd_get_pport_stats(struct be_adapter *adapter,
 
         struct be_mcc_wrb *wrb;
         struct lancer_cmd_req_pport_stats *req;
-        struct be_sge *sge;
         int status = 0;
 
         spin_lock_bh(&adapter->mcc_lock);
@@ -1261,23 +1222,14 @@ int lancer_cmd_get_pport_stats(struct be_adapter *adapter,
                 goto err;
         }
         req = nonemb_cmd->va;
-        sge = nonembedded_sgl(wrb);
-
-        be_wrb_hdr_prepare(wrb, nonemb_cmd->size, false, 1,
-                        OPCODE_ETH_GET_PPORT_STATS);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
-                        OPCODE_ETH_GET_PPORT_STATS, nonemb_cmd->size);
 
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
+                        OPCODE_ETH_GET_PPORT_STATS, nonemb_cmd->size, wrb,
+                        nonemb_cmd);
 
         req->cmd_params.params.pport_num = cpu_to_le16(adapter->port_num);
         req->cmd_params.params.reset_stats = 0;
 
-        wrb->tag1 = CMD_SUBSYSTEM_ETH;
-        sge->pa_hi = cpu_to_le32(upper_32_bits(nonemb_cmd->dma));
-        sge->pa_lo = cpu_to_le32(nonemb_cmd->dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(nonemb_cmd->size);
-
         be_mcc_notify(adapter);
         adapter->stats_cmd_sent = true;
 
@@ -1303,11 +1255,8 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u8 *mac_speed,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_NTWK_LINK_STATUS_QUERY);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_LINK_STATUS_QUERY, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_LINK_STATUS_QUERY, sizeof(*req), wrb, NULL);
 
         status = be_mcc_notify_wait(adapter);
         if (!status) {
@@ -1343,11 +1292,9 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req),
+                wrb, NULL);
 
         wrb->tag1 = mccq_index;
 
@@ -1374,11 +1321,8 @@ int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_MANAGE_FAT);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_MANAGE_FAT, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_MANAGE_FAT, sizeof(*req), wrb, NULL);
         req->fat_operation = cpu_to_le32(QUERY_FAT);
         status = be_mcc_notify_wait(adapter);
         if (!status) {
@@ -1397,7 +1341,6 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
         struct be_dma_mem get_fat_cmd;
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_fat *req;
-        struct be_sge *sge;
         u32 offset = 0, total_size, buf_size,
                                 log_offset = sizeof(u32), payload_len;
         int status;
@@ -1430,18 +1373,11 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
                         goto err;
                 }
                 req = get_fat_cmd.va;
-                sge = nonembedded_sgl(wrb);
 
                 payload_len = sizeof(struct be_cmd_req_get_fat) + buf_size;
-                be_wrb_hdr_prepare(wrb, payload_len, false, 1,
-                                OPCODE_COMMON_MANAGE_FAT);
-
-                be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                                OPCODE_COMMON_MANAGE_FAT, payload_len);
-
-                sge->pa_hi = cpu_to_le32(upper_32_bits(get_fat_cmd.dma));
-                sge->pa_lo = cpu_to_le32(get_fat_cmd.dma & 0xFFFFFFFF);
-                sge->len = cpu_to_le32(get_fat_cmd.size);
+                be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                                OPCODE_COMMON_MANAGE_FAT, payload_len, wrb,
+                                &get_fat_cmd);
 
                 req->fat_operation = cpu_to_le32(RETRIEVE_FAT);
                 req->read_log_offset = cpu_to_le32(log_offset);
@@ -1485,11 +1421,9 @@ int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver,
         }
 
         req = embedded_payload(wrb);
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                                OPCODE_COMMON_GET_FW_VERSION);
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                                OPCODE_COMMON_GET_FW_VERSION, sizeof(*req));
 
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_GET_FW_VERSION, sizeof(*req), wrb, NULL);
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_get_fw_version *resp = embedded_payload(wrb);
@@ -1520,11 +1454,8 @@ int be_cmd_modify_eqd(struct be_adapter *adapter, u32 eq_id, u32 eqd)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_MODIFY_EQ_DELAY);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_MODIFY_EQ_DELAY, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_MODIFY_EQ_DELAY, sizeof(*req), wrb, NULL);
 
         req->num_eq = cpu_to_le32(1);
         req->delay[0].eq_id = cpu_to_le32(eq_id);
@@ -1555,11 +1486,8 @@ int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_NTWK_VLAN_CONFIG);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_VLAN_CONFIG, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_VLAN_CONFIG, sizeof(*req), wrb, NULL);
 
         req->interface_id = if_id;
         req->promiscuous = promiscuous;
@@ -1582,7 +1510,6 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
         struct be_mcc_wrb *wrb;
         struct be_dma_mem *mem = &adapter->rx_filter;
         struct be_cmd_req_rx_filter *req = mem->va;
-        struct be_sge *sge;
         int status;
 
         spin_lock_bh(&adapter->mcc_lock);
@@ -1592,16 +1519,10 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
                 status = -EBUSY;
                 goto err;
         }
-        sge = nonembedded_sgl(wrb);
-        sge->pa_hi = cpu_to_le32(upper_32_bits(mem->dma));
-        sge->pa_lo = cpu_to_le32(mem->dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(mem->size);
-        be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1,
-                                OPCODE_COMMON_NTWK_RX_FILTER);
-
         memset(req, 0, sizeof(*req));
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                                OPCODE_COMMON_NTWK_RX_FILTER, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                                OPCODE_COMMON_NTWK_RX_FILTER, sizeof(*req),
+                                wrb, mem);
 
         req->if_id = cpu_to_le32(adapter->if_handle);
         if (flags & IFF_PROMISC) {
@@ -1646,11 +1567,8 @@ int be_cmd_set_flow_control(struct be_adapter *adapter, u32 tx_fc, u32 rx_fc)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_SET_FLOW_CONTROL);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_SET_FLOW_CONTROL, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_SET_FLOW_CONTROL, sizeof(*req), wrb, NULL);
 
         req->tx_flow_control = cpu_to_le16((u16)tx_fc);
         req->rx_flow_control = cpu_to_le16((u16)rx_fc);
@@ -1678,11 +1596,8 @@ int be_cmd_get_flow_control(struct be_adapter *adapter, u32 *tx_fc, u32 *rx_fc)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_GET_FLOW_CONTROL);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_GET_FLOW_CONTROL, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_GET_FLOW_CONTROL, sizeof(*req), wrb, NULL);
 
         status = be_mcc_notify_wait(adapter);
         if (!status) {
@@ -1711,11 +1626,8 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num,
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_QUERY_FIRMWARE_CONFIG);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_QUERY_FIRMWARE_CONFIG, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_QUERY_FIRMWARE_CONFIG, sizeof(*req), wrb, NULL);
 
         status = be_mbox_notify_wait(adapter);
         if (!status) {
@@ -1742,11 +1654,8 @@ int be_cmd_reset_function(struct be_adapter *adapter)
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_FUNCTION_RESET);
-
-        be_cmd_hdr_prepare(req, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_FUNCTION_RESET, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(req, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_FUNCTION_RESET, sizeof(*req), wrb, NULL);
 
         status = be_mbox_notify_wait(adapter);
 
@@ -1768,11 +1677,8 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, u16 table_size)
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                OPCODE_ETH_RSS_CONFIG);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
-                OPCODE_ETH_RSS_CONFIG, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
+                OPCODE_ETH_RSS_CONFIG, sizeof(*req), wrb, NULL);
 
         req->if_id = cpu_to_le32(adapter->if_handle);
         req->enable_rss = cpu_to_le16(RSS_ENABLE_TCP_IPV4 | RSS_ENABLE_IPV4);
@@ -1804,11 +1710,8 @@ int be_cmd_set_beacon_state(struct be_adapter *adapter, u8 port_num,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_ENABLE_DISABLE_BEACON);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_ENABLE_DISABLE_BEACON, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_ENABLE_DISABLE_BEACON, sizeof(*req), wrb, NULL);
 
         req->port_num = port_num;
         req->beacon_state = state;
@@ -1838,11 +1741,8 @@ int be_cmd_get_beacon_state(struct be_adapter *adapter, u8 port_num, u32 *state)
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                        OPCODE_COMMON_GET_BEACON_STATE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_GET_BEACON_STATE, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_GET_BEACON_STATE, sizeof(*req), wrb, NULL);
 
         req->port_num = port_num;
 
@@ -1879,13 +1779,10 @@ int lancer_cmd_write_object(struct be_adapter *adapter, struct be_dma_mem *cmd,
 
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(struct lancer_cmd_req_write_object),
-                        true, 1, OPCODE_COMMON_WRITE_OBJECT);
-        wrb->tag1 = CMD_SUBSYSTEM_COMMON;
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                                 OPCODE_COMMON_WRITE_OBJECT,
-                                sizeof(struct lancer_cmd_req_write_object));
+                                sizeof(struct lancer_cmd_req_write_object), wrb,
+                                NULL);
 
         ctxt = &req->context;
         AMAP_SET_BITS(struct amap_lancer_write_obj_context,
@@ -1938,7 +1835,6 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd,
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_write_flashrom *req;
-        struct be_sge *sge;
         int status;
 
         spin_lock_bh(&adapter->mcc_lock);
@@ -1950,17 +1846,9 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd,
                 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);
-        sge->pa_hi = cpu_to_le32(upper_32_bits(cmd->dma));
-        sge->pa_lo = cpu_to_le32(cmd->dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(cmd->size);
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_WRITE_FLASHROM, cmd->size, wrb, cmd);
 
         req->params.op_type = cpu_to_le32(flash_type);
         req->params.op_code = cpu_to_le32(flash_opcode);
@@ -1998,11 +1886,8 @@ int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc,
         }
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req)+4, true, 0,
-                        OPCODE_COMMON_READ_FLASHROM);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_READ_FLASHROM, sizeof(*req)+4);
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_READ_FLASHROM, sizeof(*req)+4, wrb, NULL);
 
         req->params.op_type = cpu_to_le32(IMG_TYPE_REDBOOT);
         req->params.op_code = cpu_to_le32(FLASHROM_OPER_REPORT);
@@ -2023,7 +1908,6 @@ int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_acpi_wol_magic_config *req;
-        struct be_sge *sge;
         int status;
 
         spin_lock_bh(&adapter->mcc_lock);
@@ -2034,19 +1918,12 @@ int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,
                 goto err;
         }
         req = nonemb_cmd->va;
-        sge = nonembedded_sgl(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1,
-                        OPCODE_ETH_ACPI_WOL_MAGIC_CONFIG);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
-                OPCODE_ETH_ACPI_WOL_MAGIC_CONFIG, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
+                OPCODE_ETH_ACPI_WOL_MAGIC_CONFIG, sizeof(*req), wrb,
+                nonemb_cmd);
         memcpy(req->magic_mac, mac, ETH_ALEN);
 
-        sge->pa_hi = cpu_to_le32(upper_32_bits(nonemb_cmd->dma));
-        sge->pa_lo = cpu_to_le32(nonemb_cmd->dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(nonemb_cmd->size);
-
         status = be_mcc_notify_wait(adapter);
 
 err:
@@ -2071,12 +1948,9 @@ int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
 
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                                OPCODE_LOWLEVEL_SET_LOOPBACK_MODE);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
-                        OPCODE_LOWLEVEL_SET_LOOPBACK_MODE,
-                        sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
+                        OPCODE_LOWLEVEL_SET_LOOPBACK_MODE, sizeof(*req), wrb,
+                        NULL);
 
         req->src_port = port_num;
         req->dest_port = port_num;
@@ -2106,11 +1980,8 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,
 
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                                OPCODE_LOWLEVEL_LOOPBACK_TEST);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
-                        OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
+                        OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req), wrb, NULL);
         req->hdr.timeout = cpu_to_le32(4);
 
         req->pattern = cpu_to_le64(pattern);
@@ -2136,7 +2007,6 @@ int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_ddrdma_test *req;
-        struct be_sge *sge;
         int status;
         int i, j = 0;
 
@@ -2148,15 +2018,8 @@ int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,
                 goto err;
         }
         req = cmd->va;
-        sge = nonembedded_sgl(wrb);
-        be_wrb_hdr_prepare(wrb, cmd->size, false, 1,
-                                OPCODE_LOWLEVEL_HOST_DDR_DMA);
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
-                        OPCODE_LOWLEVEL_HOST_DDR_DMA, cmd->size);
-
-        sge->pa_hi = cpu_to_le32(upper_32_bits(cmd->dma));
-        sge->pa_lo = cpu_to_le32(cmd->dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(cmd->size);
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
+                        OPCODE_LOWLEVEL_HOST_DDR_DMA, cmd->size, wrb, cmd);
 
         req->pattern = cpu_to_le64(pattern);
         req->byte_count = cpu_to_le32(byte_cnt);
@@ -2201,15 +2064,9 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
         req = nonemb_cmd->va;
         sge = nonembedded_sgl(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1,
-                        OPCODE_COMMON_SEEPROM_READ);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                        OPCODE_COMMON_SEEPROM_READ, sizeof(*req));
-
-        sge->pa_hi = cpu_to_le32(upper_32_bits(nonemb_cmd->dma));
-        sge->pa_lo = cpu_to_le32(nonemb_cmd->dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(nonemb_cmd->size);
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                        OPCODE_COMMON_SEEPROM_READ, sizeof(*req), wrb,
+                        nonemb_cmd);
 
         status = be_mcc_notify_wait(adapter);
 
@@ -2223,7 +2080,6 @@ int be_cmd_get_phy_info(struct be_adapter *adapter,
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_phy_info *req;
-        struct be_sge *sge;
         struct be_dma_mem cmd;
         int status;
 
@@ -2244,18 +2100,10 @@ int be_cmd_get_phy_info(struct be_adapter *adapter,
         }
 
         req = cmd.va;
-        sge = nonembedded_sgl(wrb);
-
-        be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1,
-                                OPCODE_COMMON_GET_PHY_DETAILS);
 
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                        OPCODE_COMMON_GET_PHY_DETAILS,
-                        sizeof(*req));
-
-        sge->pa_hi = cpu_to_le32(upper_32_bits(cmd.dma));
-        sge->pa_lo = cpu_to_le32(cmd.dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(cmd.size);
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                        OPCODE_COMMON_GET_PHY_DETAILS, sizeof(*req),
+                        wrb, &cmd);
 
         status = be_mcc_notify_wait(adapter);
         if (!status) {
@@ -2288,11 +2136,8 @@ int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain)
 
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                                OPCODE_COMMON_SET_QOS);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                        OPCODE_COMMON_SET_QOS, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                        OPCODE_COMMON_SET_QOS, sizeof(*req), wrb, NULL);
 
         req->hdr.domain = domain;
         req->valid_bits = cpu_to_le32(BE_QOS_BITS_NIC);
@@ -2310,7 +2155,6 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_cntl_attribs *req;
         struct be_cmd_resp_cntl_attribs *resp;
-        struct be_sge *sge;
         int status;
         int payload_len = max(sizeof(*req), sizeof(*resp));
         struct mgmt_controller_attrib *attribs;
@@ -2335,15 +2179,10 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
                 goto err;
         }
         req = attribs_cmd.va;
-        sge = nonembedded_sgl(wrb);
 
-        be_wrb_hdr_prepare(wrb, payload_len, false, 1,
-                        OPCODE_COMMON_GET_CNTL_ATTRIBUTES);
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                         OPCODE_COMMON_GET_CNTL_ATTRIBUTES, payload_len);
-        sge->pa_hi = cpu_to_le32(upper_32_bits(attribs_cmd.dma));
-        sge->pa_lo = cpu_to_le32(attribs_cmd.dma & 0xFFFFFFFF);
-        sge->len = cpu_to_le32(attribs_cmd.size);
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                         OPCODE_COMMON_GET_CNTL_ATTRIBUTES, payload_len, wrb,
+                        &attribs_cmd);
 
         status = be_mbox_notify_wait(adapter);
         if (!status) {
@@ -2376,11 +2215,8 @@ int be_cmd_req_native_mode(struct be_adapter *adapter)
 
         req = embedded_payload(wrb);
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
-                OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP);
-
-        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP, sizeof(*req));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP, sizeof(*req), wrb, NULL);
 
         req->valid_cap_flags = cpu_to_le32(CAPABILITY_SW_TIMESTAMPS |
                                 CAPABILITY_BE3_NATIVE_ERX_API);
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index d6a232a300ad..21804972fa2f 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -229,27 +229,29 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)
         struct be_adapter *adapter = netdev_priv(netdev);
         struct sockaddr *addr = p;
         int status = 0;
+        u8 current_mac[ETH_ALEN];
+        u32 pmac_id = adapter->pmac_id;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
-        /* MAC addr configuration will be done in hardware for VFs
-         * by their corresponding PFs. Just copy to netdev addr here
-         */
-        if (!be_physfn(adapter))
-                goto netdev_addr;
-
-        status = be_cmd_pmac_del(adapter, adapter->if_handle,
-                                adapter->pmac_id, 0);
+        status = be_cmd_mac_addr_query(adapter, current_mac,
+                        MAC_ADDRESS_TYPE_NETWORK, false, adapter->if_handle);
         if (status)
-                return status;
+                goto err;
 
-        status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data,
+        if (memcmp(addr->sa_data, current_mac, ETH_ALEN)) {
+                status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data,
                                 adapter->if_handle, &adapter->pmac_id, 0);
-netdev_addr:
-        if (!status)
-                memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+                if (status)
+                        goto err;
 
+                be_cmd_pmac_del(adapter, adapter->if_handle, pmac_id, 0);
+        }
+        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+        return 0;
+err:
+        dev_err(&adapter->pdev->dev, "MAC %pM set Failed\n", addr->sa_data);
         return status;
 }
 
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 2be46986cbe2..ca1ae985c6df 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -85,7 +85,7 @@ config APRICOT
 
 config BVME6000_NET
         tristate "BVME6000 Ethernet support"
-        depends on BVME6000MVME16x
+        depends on BVME6000
         ---help---
           This is the driver for the Ethernet interface on BVME4000 and
           BVME6000 VME boards.  Say Y here to include the driver for this chip
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 0d4d4f68d4ed..37b70f7052b6 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1689,7 +1689,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
                         sgentry = &sg_list[i - sg1entry_contains_frag_data];
 
                         sgentry->l_key = lkey;
-                        sgentry->len = frag_size(frag);
+                        sgentry->len = skb_frag_size(frag);
                         sgentry->vaddr = ehea_map_vaddr(skb_frag_address(frag));
                         swqe->descriptors++;
                 }
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 680312710a78..a855db1ad249 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -47,7 +47,7 @@
 #include <linux/if_vlan.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
-#include <linux/pm_qos_params.h>
+#include <linux/pm_qos.h>
 #include <linux/pm_runtime.h>
 #include <linux/aer.h>
 #include <linux/prefetch.h>
diff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c
index 74f2f11ac290..469d95eaa154 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mbx.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.c
@@ -34,7 +34,7 @@
  *  @size: Length of buffer
  *  @mbx_id: id of mailbox to read
  *
- *  returns SUCCESS if it successfuly read message from buffer
+ *  returns SUCCESS if it successfully read message from buffer
  **/
 s32 igb_read_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
 {
diff --git a/drivers/net/ethernet/intel/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c
index 3d6f4cc3998a..048aae248d06 100644
--- a/drivers/net/ethernet/intel/igbvf/mbx.c
+++ b/drivers/net/ethernet/intel/igbvf/mbx.c
@@ -288,7 +288,7 @@ out_no_write:
  *  @msg: The message buffer
  *  @size: Length of buffer
  *
- *  returns SUCCESS if it successfuly read message from buffer
+ *  returns SUCCESS if it successfully read message from buffer
  **/
 static s32 e1000_read_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size)
 {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
index 1ff0eefcfd0a..3f725d48336d 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
@@ -38,7 +38,7 @@
  *  @size: Length of buffer
  *  @mbx_id: id of mailbox to read
  *
- *  returns SUCCESS if it successfuly read message from buffer
+ *  returns SUCCESS if it successfully read message from buffer
  **/
 s32 ixgbe_read_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
 {
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c
index 7a8833125770..930fa83f2568 100644
--- a/drivers/net/ethernet/intel/ixgbevf/mbx.c
+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.c
@@ -276,7 +276,7 @@ out_no_write:
  *  @msg: The message buffer
  *  @size: Length of buffer
  *
- *  returns 0 if it successfuly read message from buffer
+ *  returns 0 if it successfully read message from buffer
  **/
 static s32 ixgbevf_read_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size)
 {
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 7b083c438a14..cbd026f3bc57 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -2082,7 +2082,7 @@ static void sky2_hw_down(struct sky2_port *sky2)
 
         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
 
-        /* Force any delayed status interrrupt and NAPI */
+        /* Force any delayed status interrupt and NAPI */
         sky2_write32(hw, STAT_LEV_TIMER_CNT, 0);
         sky2_write32(hw, STAT_TX_TIMER_CNT, 0);
         sky2_write32(hw, STAT_ISR_TIMER_CNT, 0);
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c
index 70788401d699..ab81c0dc96e2 100644
--- a/drivers/net/ethernet/micrel/ks8695net.c
+++ b/drivers/net/ethernet/micrel/ks8695net.c
@@ -414,7 +414,7 @@ ks8695_tx_irq(int irq, void *dev_id)
  *    Interrupt Status Register (Offset 0xF208)
  *        Bit29: WAN MAC Receive Status
  *        Bit16: LAN MAC Receive Status
- *    So, this Rx interrrupt enable/status bit number is equal
+ *    So, this Rx interrupt enable/status bit number is equal
  *    as Rx IRQ number.
  */
 static inline u32 ks8695_get_rx_enable_bit(struct ks8695_priv *ksp)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 2fd1ba8fee4a..7ed53dbb8646 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -36,8 +36,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 24
-#define QLCNIC_LINUX_VERSIONID  "5.0.24"
+#define _QLCNIC_LINUX_SUBVERSION 25
+#define QLCNIC_LINUX_VERSIONID  "5.0.25"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 5d8bec283267..8aa1c6e8667b 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -935,31 +935,49 @@ static int qlcnic_set_led(struct net_device *dev,
 {
         struct qlcnic_adapter *adapter = netdev_priv(dev);
         int max_sds_rings = adapter->max_sds_rings;
+        int err = -EIO, active = 1;
+
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
+                netdev_warn(dev, "LED test not supported for non "
+                                "privilege function\n");
+                return -EOPNOTSUPP;
+        }
 
         switch (state) {
         case ETHTOOL_ID_ACTIVE:
                 if (test_and_set_bit(__QLCNIC_LED_ENABLE, &adapter->state))
                         return -EBUSY;
 
-                if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
-                        if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
-                                return -EIO;
+                if (test_bit(__QLCNIC_RESETTING, &adapter->state))
+                        break;
 
-                        if (qlcnic_diag_alloc_res(dev, QLCNIC_LED_TEST)) {
-                                clear_bit(__QLCNIC_RESETTING, &adapter->state);
-                                return -EIO;
-                        }
+                if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
+                        if (qlcnic_diag_alloc_res(dev, QLCNIC_LED_TEST))
+                                break;
                         set_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state);
                 }
 
-                if (adapter->nic_ops->config_led(adapter, 1, 0xf) == 0)
-                        return 0;
+                if (adapter->nic_ops->config_led(adapter, 1, 0xf) == 0) {
+                        err = 0;
+                        break;
+                }
 
                 dev_err(&adapter->pdev->dev,
                         "Failed to set LED blink state.\n");
                 break;
 
         case ETHTOOL_ID_INACTIVE:
+                active = 0;
+
+                if (test_bit(__QLCNIC_RESETTING, &adapter->state))
+                        break;
+
+                if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
+                        if (qlcnic_diag_alloc_res(dev, QLCNIC_LED_TEST))
+                                break;
+                        set_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state);
+                }
+
                 if (adapter->nic_ops->config_led(adapter, 0, 0xf))
                         dev_err(&adapter->pdev->dev,
                                 "Failed to reset LED blink state.\n");
@@ -970,14 +988,13 @@ static int qlcnic_set_led(struct net_device *dev,
                 return -EINVAL;
         }
 
-        if (test_and_clear_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state)) {
+        if (test_and_clear_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state))
                 qlcnic_diag_free_res(dev, max_sds_rings);
-                clear_bit(__QLCNIC_RESETTING, &adapter->state);
-        }
 
-        clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);
+        if (!active || err)
+                clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);
 
-        return -EIO;
+        return err;
 }
 
 static void
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
index 92bc8ce9b287..a52819303d1b 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
@@ -407,7 +407,9 @@ enum {
 #define QLCNIC_CRB_SRE          QLCNIC_PCI_CRB_WINDOW(QLCNIC_HW_PX_MAP_CRB_SRE)
 #define QLCNIC_CRB_ROMUSB       \
         QLCNIC_PCI_CRB_WINDOW(QLCNIC_HW_PX_MAP_CRB_ROMUSB)
+#define QLCNIC_CRB_EPG          QLCNIC_PCI_CRB_WINDOW(QLCNIC_HW_PX_MAP_CRB_EG)
 #define QLCNIC_CRB_I2Q          QLCNIC_PCI_CRB_WINDOW(QLCNIC_HW_PX_MAP_CRB_I2Q)
+#define QLCNIC_CRB_TIMER        QLCNIC_PCI_CRB_WINDOW(QLCNIC_HW_PX_MAP_CRB_TIMR)
 #define QLCNIC_CRB_I2C0         QLCNIC_PCI_CRB_WINDOW(QLCNIC_HW_PX_MAP_CRB_I2C0)
 #define QLCNIC_CRB_SMB          QLCNIC_PCI_CRB_WINDOW(QLCNIC_HW_PX_MAP_CRB_SMB)
 #define QLCNIC_CRB_MAX          QLCNIC_PCI_CRB_WINDOW(64)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index 74e9d7b94965..bcb81e47543a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -566,7 +566,7 @@ int qlcnic_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
                 return -EIO;
 
         if (qlcnic_nic_set_promisc(adapter, VPORT_MISS_MODE_ACCEPT_ALL)) {
-                qlcnic_set_fw_loopback(adapter, mode);
+                qlcnic_set_fw_loopback(adapter, 0);
                 return -EIO;
         }
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 312c1c37889d..38669583840c 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -422,9 +422,53 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)
         QLCWR32(adapter, CRB_CMDPEG_STATE, 0);
         QLCWR32(adapter, CRB_RCVPEG_STATE, 0);
 
-        qlcnic_rom_lock(adapter);
-        QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xfeffffff);
+        /* Halt all the indiviual PEGs and other blocks */
+        /* disable all I2Q */
+        QLCWR32(adapter, QLCNIC_CRB_I2Q + 0x10, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_I2Q + 0x14, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_I2Q + 0x18, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_I2Q + 0x1c, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_I2Q + 0x20, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_I2Q + 0x24, 0x0);
+
+        /* disable all niu interrupts */
+        QLCWR32(adapter, QLCNIC_CRB_NIU + 0x40, 0xff);
+        /* disable xge rx/tx */
+        QLCWR32(adapter, QLCNIC_CRB_NIU + 0x70000, 0x00);
+        /* disable xg1 rx/tx */
+        QLCWR32(adapter, QLCNIC_CRB_NIU + 0x80000, 0x00);
+        /* disable sideband mac */
+        QLCWR32(adapter, QLCNIC_CRB_NIU + 0x90000, 0x00);
+        /* disable ap0 mac */
+        QLCWR32(adapter, QLCNIC_CRB_NIU + 0xa0000, 0x00);
+        /* disable ap1 mac */
+        QLCWR32(adapter, QLCNIC_CRB_NIU + 0xb0000, 0x00);
+
+        /* halt sre */
+        val = QLCRD32(adapter, QLCNIC_CRB_SRE + 0x1000);
+        QLCWR32(adapter, QLCNIC_CRB_SRE + 0x1000, val & (~(0x1)));
+
+        /* halt epg */
+        QLCWR32(adapter, QLCNIC_CRB_EPG + 0x1300, 0x1);
+
+        /* halt timers */
+        QLCWR32(adapter, QLCNIC_CRB_TIMER + 0x0, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_TIMER + 0x8, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_TIMER + 0x10, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_TIMER + 0x18, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_TIMER + 0x100, 0x0);
+        QLCWR32(adapter, QLCNIC_CRB_TIMER + 0x200, 0x0);
+        /* halt pegs */
+        QLCWR32(adapter, QLCNIC_CRB_PEG_NET_0 + 0x3c, 1);
+        QLCWR32(adapter, QLCNIC_CRB_PEG_NET_1 + 0x3c, 1);
+        QLCWR32(adapter, QLCNIC_CRB_PEG_NET_2 + 0x3c, 1);
+        QLCWR32(adapter, QLCNIC_CRB_PEG_NET_3 + 0x3c, 1);
+        QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x3c, 1);
+        msleep(20);
+
         qlcnic_rom_unlock(adapter);
+        /* big hammer don't reset CAM block on reset */
+        QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xfeffffff);
 
         /* Init HW CRB block */
         if (qlcnic_rom_fast_read(adapter, 0, &n) != 0 || (n != 0xcafecafe) ||
@@ -522,8 +566,10 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)
         QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x8, 0);
         QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0xc, 0);
         msleep(1);
+
         QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS1, 0);
         QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS2, 0);
+
         return 0;
 }
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 106503f118f6..0bd163828e33 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2840,8 +2840,15 @@ qlcnic_fwinit_work(struct work_struct *work)
                 goto wait_npar;
         }
 
+        if (dev_state == QLCNIC_DEV_INITIALIZING ||
+            dev_state == QLCNIC_DEV_READY) {
+                dev_info(&adapter->pdev->dev, "Detected state change from "
+                                "DEV_NEED_RESET, skipping ack check\n");
+                goto skip_ack_check;
+        }
+
         if (adapter->fw_wait_cnt++ > adapter->reset_ack_timeo) {
-                dev_err(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",
+                dev_info(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",
                                         adapter->reset_ack_timeo);
                 goto skip_ack_check;
         }
@@ -3497,11 +3504,16 @@ qlcnic_store_beacon(struct device *dev,
 {
         struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
         int max_sds_rings = adapter->max_sds_rings;
-        int dev_down = 0;
         u16 beacon;
         u8 b_state, b_rate;
         int err;
 
+        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
+                dev_warn(dev, "LED test not supported for non "
+                                "privilege function\n");
+                return -EOPNOTSUPP;
+        }
+
         if (len != sizeof(u16))
                 return QL_STATUS_INVALID_PARAM;
 
@@ -3513,36 +3525,40 @@ qlcnic_store_beacon(struct device *dev,
         if (adapter->ahw->beacon_state == b_state)
                 return len;
 
+        rtnl_lock();
+
         if (!adapter->ahw->beacon_state)
-                if (test_and_set_bit(__QLCNIC_LED_ENABLE, &adapter->state))
+                if (test_and_set_bit(__QLCNIC_LED_ENABLE, &adapter->state)) {
+                        rtnl_unlock();
                         return -EBUSY;
+                }
+
+        if (test_bit(__QLCNIC_RESETTING, &adapter->state)) {
+                err = -EIO;
+                goto out;
+        }
 
         if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
-                if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
-                        return -EIO;
                 err = qlcnic_diag_alloc_res(adapter->netdev, QLCNIC_LED_TEST);
-                if (err) {
-                        clear_bit(__QLCNIC_RESETTING, &adapter->state);
-                        clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);
-                        return err;
-                }
-                dev_down = 1;
+                if (err)
+                        goto out;
+                set_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state);
         }
 
         err = qlcnic_config_led(adapter, b_state, b_rate);
 
         if (!err) {
-                adapter->ahw->beacon_state = b_state;
                 err = len;
+                adapter->ahw->beacon_state = b_state;
         }
 
-        if (dev_down) {
+        if (test_and_clear_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state))
                 qlcnic_diag_free_res(adapter->netdev, max_sds_rings);
-                clear_bit(__QLCNIC_RESETTING, &adapter->state);
-        }
 
-        if (!b_state)
+ out:
+        if (!adapter->ahw->beacon_state)
                 clear_bit(__QLCNIC_LED_ENABLE, &adapter->state);
+        rtnl_unlock();
 
         return err;
 }
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig
index 1854c88dfb92..5a689af516e9 100644
--- a/drivers/net/ethernet/smsc/Kconfig
+++ b/drivers/net/ethernet/smsc/Kconfig
@@ -106,8 +106,7 @@ config SMSC911X
           Say Y here if you want support for SMSC LAN911x and LAN921x families
           of ethernet controllers.
 
-          To compile this driver as a module, choose M here and read
-          <file:Documentation/networking/net-modules.txt>. The module
+          To compile this driver as a module, choose M here. The module
           will be called smsc911x.
 
 config SMSC911X_ARCH_HOOKS
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 9100c100d295..2cc119295821 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -49,7 +49,7 @@ struct stmmac_extra_stats {
         unsigned long tx_underflow ____cacheline_aligned;
         unsigned long tx_carrier;
         unsigned long tx_losscarrier;
-        unsigned long tx_heartbeat;
+        unsigned long vlan_tag;
         unsigned long tx_deferred;
         unsigned long tx_vlan;
         unsigned long tx_jabber;
@@ -58,9 +58,9 @@ struct stmmac_extra_stats {
         unsigned long tx_ip_header_error;
         /* Receive errors */
         unsigned long rx_desc;
-        unsigned long rx_partial;
-        unsigned long rx_runt;
-        unsigned long rx_toolong;
+        unsigned long sa_filter_fail;
+        unsigned long overflow_error;
+        unsigned long ipc_csum_error;
         unsigned long rx_collision;
         unsigned long rx_crc;
         unsigned long rx_length;
diff --git a/drivers/net/ethernet/stmicro/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
index 63a03e264694..9820ec842cc0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/descs.h
+++ b/drivers/net/ethernet/stmicro/stmmac/descs.h
@@ -25,33 +25,34 @@ struct dma_desc {
         union {
                 struct {
                         /* RDES0 */
-                        u32 reserved1:1;
+                        u32 payload_csum_error:1;
                         u32 crc_error:1;
                         u32 dribbling:1;
                         u32 mii_error:1;
                         u32 receive_watchdog:1;
                         u32 frame_type:1;
                         u32 collision:1;
-                        u32 frame_too_long:1;
+                        u32 ipc_csum_error:1;
                         u32 last_descriptor:1;
                         u32 first_descriptor:1;
-                        u32 multicast_frame:1;
-                        u32 run_frame:1;
+                        u32 vlan_tag:1;
+                        u32 overflow_error:1;
                         u32 length_error:1;
-                        u32 partial_frame_error:1;
+                        u32 sa_filter_fail:1;
                         u32 descriptor_error:1;
                         u32 error_summary:1;
                         u32 frame_length:14;
-                        u32 filtering_fail:1;
+                        u32 da_filter_fail:1;
                         u32 own:1;
                         /* RDES1 */
                         u32 buffer1_size:11;
                         u32 buffer2_size:11;
-                        u32 reserved2:2;
+                        u32 reserved1:2;
                         u32 second_address_chained:1;
                         u32 end_ring:1;
-                        u32 reserved3:5;
+                        u32 reserved2:5;
                         u32 disable_ic:1;
+
                 } rx;
                 struct {
                         /* RDES0 */
@@ -91,24 +92,28 @@ struct dma_desc {
                         u32 underflow_error:1;
                         u32 excessive_deferral:1;
                         u32 collision_count:4;
-                        u32 heartbeat_fail:1;
+                        u32 vlan_frame:1;
                         u32 excessive_collisions:1;
                         u32 late_collision:1;
                         u32 no_carrier:1;
                         u32 loss_carrier:1;
-                        u32 reserved1:3;
+                        u32 payload_error:1;
+                        u32 frame_flushed:1;
+                        u32 jabber_timeout:1;
                         u32 error_summary:1;
-                        u32 reserved2:15;
+                        u32 ip_header_error:1;
+                        u32 time_stamp_status:1;
+                        u32 reserved1:13;
                         u32 own:1;
                         /* TDES1 */
                         u32 buffer1_size:11;
                         u32 buffer2_size:11;
-                        u32 reserved3:1;
+                        u32 time_stamp_enable:1;
                         u32 disable_padding:1;
                         u32 second_address_chained:1;
                         u32 end_ring:1;
                         u32 crc_disable:1;
-                        u32 reserved4:2;
+                        u32 checksum_insertion:2;
                         u32 first_segment:1;
                         u32 last_segment:1;
                         u32 interrupt:1;
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index f7e8ba7f501a..fda5d2b31d3a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -50,11 +50,12 @@ static int ndesc_get_tx_status(void *data, struct stmmac_extra_stats *x,
                         stats->collisions += p->des01.tx.collision_count;
                 ret = -1;
         }
-        if (unlikely(p->des01.tx.heartbeat_fail)) {
-                x->tx_heartbeat++;
-                stats->tx_heartbeat_errors++;
-                ret = -1;
+
+        if (p->des01.etx.vlan_frame) {
+                CHIP_DBG(KERN_INFO "GMAC TX status: VLAN frame\n");
+                x->tx_vlan++;
         }
+
         if (unlikely(p->des01.tx.deferred))
                 x->tx_deferred++;
 
@@ -68,12 +69,12 @@ static int ndesc_get_tx_len(struct dma_desc *p)
 
 /* This function verifies if each incoming frame has some errors
  * and, if required, updates the multicast statistics.
- * In case of success, it returns csum_none because the device
- * is not able to compute the csum in HW. */
+ * In case of success, it returns good_frame because the GMAC device
+ * is supposed to be able to compute the csum in HW. */
 static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
                                struct dma_desc *p)
 {
-        int ret = csum_none;
+        int ret = good_frame;
         struct net_device_stats *stats = (struct net_device_stats *)data;
 
         if (unlikely(p->des01.rx.last_descriptor == 0)) {
@@ -86,12 +87,12 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
         if (unlikely(p->des01.rx.error_summary)) {
                 if (unlikely(p->des01.rx.descriptor_error))
                         x->rx_desc++;
-                if (unlikely(p->des01.rx.partial_frame_error))
-                        x->rx_partial++;
-                if (unlikely(p->des01.rx.run_frame))
-                        x->rx_runt++;
-                if (unlikely(p->des01.rx.frame_too_long))
-                        x->rx_toolong++;
+                if (unlikely(p->des01.rx.sa_filter_fail))
+                        x->sa_filter_fail++;
+                if (unlikely(p->des01.rx.overflow_error))
+                        x->overflow_error++;
+                if (unlikely(p->des01.rx.ipc_csum_error))
+                        x->ipc_csum_error++;
                 if (unlikely(p->des01.rx.collision)) {
                         x->rx_collision++;
                         stats->collisions++;
@@ -113,10 +114,10 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
                 x->rx_mii++;
                 ret = discard_frame;
         }
-        if (p->des01.rx.multicast_frame) {
-                x->rx_multicast++;
-                stats->multicast++;
-        }
+#ifdef STMMAC_VLAN_TAG_USED
+        if (p->des01.rx.vlan_tag)
+                x->vlan_tag++;
+#endif
         return ret;
 }
 
@@ -184,6 +185,9 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
 {
         p->des01.tx.first_segment = is_fs;
         norm_set_tx_desc_len(p, len);
+
+        if (likely(csum_flag))
+                p->des01.tx.checksum_insertion = cic_full;
 }
 
 static void ndesc_clear_tx_ic(struct dma_desc *p)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 406404f6e321..e8eff09bbbd7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -50,7 +50,7 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(tx_underflow),
         STMMAC_STAT(tx_carrier),
         STMMAC_STAT(tx_losscarrier),
-        STMMAC_STAT(tx_heartbeat),
+        STMMAC_STAT(vlan_tag),
         STMMAC_STAT(tx_deferred),
         STMMAC_STAT(tx_vlan),
         STMMAC_STAT(rx_vlan),
@@ -59,9 +59,9 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(tx_payload_error),
         STMMAC_STAT(tx_ip_header_error),
         STMMAC_STAT(rx_desc),
-        STMMAC_STAT(rx_partial),
-        STMMAC_STAT(rx_runt),
-        STMMAC_STAT(rx_toolong),
+        STMMAC_STAT(sa_filter_fail),
+        STMMAC_STAT(overflow_error),
+        STMMAC_STAT(ipc_csum_error),
         STMMAC_STAT(rx_collision),
         STMMAC_STAT(rx_crc),
         STMMAC_STAT(rx_length),
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index aeaa15b451de..20546bbbb8db 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -325,7 +325,7 @@ static int stmmac_init_phy(struct net_device *dev)
             (interface == PHY_INTERFACE_MODE_RMII))) {
                 phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |
                                       SUPPORTED_Asym_Pause);
-                priv->phydev->advertising = priv->phydev->supported;
+                phydev->advertising = phydev->supported;
         }
 
         /*
@@ -812,9 +812,11 @@ static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)
  */
 static int stmmac_get_hw_features(struct stmmac_priv *priv)
 {
-        u32 hw_cap = priv->hw->dma->get_hw_feature(priv->ioaddr);
+        u32 hw_cap = 0;
+
+        if (priv->hw->dma->get_hw_feature) {
+                hw_cap = priv->hw->dma->get_hw_feature(priv->ioaddr);
 
-        if (likely(hw_cap)) {
                 priv->dma_cap.mbps_10_100 = (hw_cap & DMA_HW_FEAT_MIISEL);
                 priv->dma_cap.mbps_1000 = (hw_cap & DMA_HW_FEAT_GMIISEL) >> 1;
                 priv->dma_cap.half_duplex = (hw_cap & DMA_HW_FEAT_HDSEL) >> 2;
@@ -937,6 +939,7 @@ static int stmmac_open(struct net_device *dev)
 
         stmmac_get_hw_features(priv);
 
+        priv->rx_coe = priv->hw->mac->rx_coe(priv->ioaddr);
         if (priv->rx_coe)
                 pr_info("stmmac: Rx Checksum Offload Engine supported\n");
         if (priv->plat->tx_coe)
@@ -1274,8 +1277,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
 #endif
                         skb->protocol = eth_type_trans(skb, priv->dev);
 
-                        if (unlikely(status == csum_none)) {
-                                /* always for the old mac 10/100 */
+                        if (unlikely(!priv->rx_coe)) {
+                                /* No RX COE for old mac10/100 devices */
                                 skb_checksum_none_assert(skb);
                                 netif_receive_skb(skb);
                         } else {
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index 78e3fb226cce..10826d8a2a2d 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -177,7 +177,7 @@ struct tile_net_cpu {
         struct tile_net_stats_t stats;
         /* True iff NAPI is enabled. */
         bool napi_enabled;
-        /* True if this tile has succcessfully registered with the IPP. */
+        /* True if this tile has successfully registered with the IPP. */
         bool registered;
         /* True if the link was down last time we tried to register. */
         bool link_down;
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 25bb2a015e18..a40fab44b9ae 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -183,7 +183,7 @@ config OLD_BELKIN_DONGLE
           Say Y here if you want to build support for the Adaptec Airport 1000
           and 2000 dongles.  If you want to compile it as a module, choose
           M here. Some information is contained in the comments
-          at the top of <file:drivers/net/irda/old_belkin.c>.
+          at the top of <file:drivers/net/irda/old_belkin-sir.c>.
 
 config ACT200L_DONGLE
         tristate "ACTiSYS IR-200L dongle"
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index d84c4224dd12..e8be47d6d7d0 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -553,7 +553,7 @@ static int bcm5481_config_aneg(struct phy_device *phydev)
                 /*
                  * There is no BCM5481 specification available, so down
                  * here is everything we know about "register 0x18". This
-                 * at least helps BCM5481 to successfuly receive packets
+                 * at least helps BCM5481 to successfully receive packets
                  * on MPC8360E-RDK board. Peter Barada <peterb@logicpd.com>
                  * says: "This sets delay between the RXD and RXC signals
                  * instead of using trace lengths to achieve timing".
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index cdb958875ba4..7d6082160bcc 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1476,7 +1476,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
         if (!dev->suspend_count++) {
                 spin_lock_irq(&dev->txq.lock);
                 /* don't autosuspend while transmitting */
-                if (dev->txq.qlen && (message.event & PM_EVENT_AUTO)) {
+                if (dev->txq.qlen && PMSG_IS_AUTO(message)) {
                         spin_unlock_irq(&dev->txq.lock);
                         return -EBUSY;
                 } else {
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 298f2b0b6311..9a644d052f1e 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -599,7 +599,7 @@ void i2400mu_disconnect(struct usb_interface *iface)
  *
  *    As well, the device might refuse going to sleep for whichever
  *    reason. In this case we just fail. For system suspend/hibernate,
- *    we *can't* fail. We check PM_EVENT_AUTO to see if the
+ *    we *can't* fail. We check PMSG_IS_AUTO to see if the
  *    suspend call comes from the USB stack or from the system and act
  *    in consequence.
  *
@@ -615,7 +615,7 @@ int i2400mu_suspend(struct usb_interface *iface, pm_message_t pm_msg)
         struct i2400m *i2400m = &i2400mu->i2400m;
 
 #ifdef CONFIG_PM
-        if (pm_msg.event & PM_EVENT_AUTO)
+        if (PMSG_IS_AUTO(pm_msg))
                 is_autosuspend = 1;
 #endif
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index e0ab0657cc3a..88279e325dca 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -868,10 +868,6 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)
         /* Do PA Calibration */
         ar9002_hw_pa_cal(ah, true);
 
-        /* Do NF Calibration after DC offset and other calibrations */
-        ath9k_hw_loadnf(ah, chan);
-        ath9k_hw_start_nfcal(ah, true);
-
         if (ah->caldata)
                 ah->caldata->nfcal_pending = true;
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 16851cb109a6..12a730dcb500 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -908,12 +908,15 @@ static bool ar9003_hw_rtt_restore(struct ath_hw *ah, struct ath9k_channel *chan)
         int i;
         bool restore;
 
-        if (!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT) || !ah->caldata)
+        if (!ah->caldata)
                 return false;
 
         hist = &ah->caldata->rtt_hist;
+        if (!hist->num_readings)
+                return false;
+
         ar9003_hw_rtt_enable(ah);
-        ar9003_hw_rtt_set_mask(ah, 0x10);
+        ar9003_hw_rtt_set_mask(ah, 0x00);
         for (i = 0; i < AR9300_MAX_CHAINS; i++) {
                 if (!(ah->rxchainmask & (1 << i)))
                         continue;
@@ -1070,6 +1073,7 @@ skip_tx_iqcal:
                 if (is_reusable && (hist->num_readings < RTT_HIST_MAX)) {
                         u32 *table;
 
+                        hist->num_readings++;
                         for (i = 0; i < AR9300_MAX_CHAINS; i++) {
                                 if (!(ah->rxchainmask & (1 << i)))
                                         continue;
@@ -1081,9 +1085,6 @@ skip_tx_iqcal:
                 ar9003_hw_rtt_disable(ah);
         }
 
-        ath9k_hw_loadnf(ah, chan);
-        ath9k_hw_start_nfcal(ah, true);
-
         /* Initialize list pointers */
         ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
         ah->supp_cals = IQ_MISMATCH_CAL;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 2f4023e66081..4114fe752c6b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -572,14 +572,14 @@
 
 #define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
 
-#define AR_PHY_TX_IQCAL_CONTROL_0   (AR_SM_BASE + AR_SREV_9485(ah) ? \
-                                                 0x3c4 : 0x444)
-#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + AR_SREV_9485(ah) ? \
-                                                 0x3c8 : 0x448)
-#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + AR_SREV_9485(ah) ? \
-                                                 0x3c4 : 0x440)
-#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + AR_SREV_9485(ah) ? \
-                                                 0x3f0 : 0x48c)
+#define AR_PHY_TX_IQCAL_CONTROL_0   (AR_SM_BASE + (AR_SREV_9485(ah) ? \
+                                                 0x3c4 : 0x444))
+#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + (AR_SREV_9485(ah) ? \
+                                                 0x3c8 : 0x448))
+#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + (AR_SREV_9485(ah) ? \
+                                                 0x3c4 : 0x440))
+#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + (AR_SREV_9485(ah) ? \
+                                                 0x3f0 : 0x48c))
 #define AR_PHY_TX_IQCAL_CORR_COEFF_B0(_i)    (AR_SM_BASE + \
                                              (AR_SREV_9485(ah) ? \
                                               0x3d0 : 0x450) + ((_i) << 2))
@@ -651,7 +651,7 @@
 #define AR_SWITCH_TABLE_ALL_S (0)
 
 #define AR_PHY_65NM_CH0_THERM       (AR_SREV_9300(ah) ? 0x16290 :\
-                                        (AR_SREV_9485(ah) ? 0x1628c : 0x16294))
+                                        (AR_SREV_9462(ah) ? 0x16294 : 0x1628c))
 
 #define AR_PHY_65NM_CH0_THERM_LOCAL   0x80000000
 #define AR_PHY_65NM_CH0_THERM_LOCAL_S 31
@@ -668,12 +668,12 @@
 #define AR_PHY_65NM_CH2_RXTX2       0x16904
 
 #define AR_CH0_TOP2             (AR_SREV_9300(ah) ? 0x1628c : \
-                                        (AR_SREV_9485(ah) ? 0x16284 : 0x16290))
+                                        (AR_SREV_9462(ah) ? 0x16290 : 0x16284))
 #define AR_CH0_TOP2_XPABIASLVL          0xf000
 #define AR_CH0_TOP2_XPABIASLVL_S        12
 
 #define AR_CH0_XTAL             (AR_SREV_9300(ah) ? 0x16294 : \
-                                        (AR_SREV_9485(ah) ? 0x16290 : 0x16298))
+                                        (AR_SREV_9462(ah) ? 0x16298 : 0x16290))
 #define AR_CH0_XTAL_CAPINDAC    0x7f000000
 #define AR_CH0_XTAL_CAPINDAC_S  24
 #define AR_CH0_XTAL_CAPOUTDAC   0x00fe0000
@@ -908,8 +908,8 @@
 #define AR_PHY_TPC_5_B1         (AR_SM1_BASE + 0x208)
 #define AR_PHY_TPC_6_B1         (AR_SM1_BASE + 0x20c)
 #define AR_PHY_TPC_11_B1        (AR_SM1_BASE + 0x220)
-#define AR_PHY_PDADC_TAB_1      (AR_SM1_BASE + (AR_SREV_AR9300(ah) ? \
-                                        0x240 : 0x280))
+#define AR_PHY_PDADC_TAB_1      (AR_SM1_BASE + (AR_SREV_AR9462(ah) ? \
+                                        0x280 : 0x240))
 #define AR_PHY_TPC_19_B1        (AR_SM1_BASE + 0x240)
 #define AR_PHY_TPC_19_B1_ALPHA_THERM            0xff
 #define AR_PHY_TPC_19_B1_ALPHA_THERM_S          0
@@ -931,10 +931,10 @@
 #define AR_PHY_AIC_SRAM_ADDR_B1 (AR_SM1_BASE + 0x5f0)
 #define AR_PHY_AIC_SRAM_DATA_B1 (AR_SM1_BASE + 0x5f4)
 
-#define AR_PHY_RTT_TABLE_SW_INTF_B(i)   (0x384 + (i) ? \
-                                        AR_SM1_BASE : AR_SM_BASE)
-#define AR_PHY_RTT_TABLE_SW_INTF_1_B(i) (0x388 + (i) ? \
-                                        AR_SM1_BASE : AR_SM_BASE)
+#define AR_PHY_RTT_TABLE_SW_INTF_B(i)   (0x384 + ((i) ? \
+                                        AR_SM1_BASE : AR_SM_BASE))
+#define AR_PHY_RTT_TABLE_SW_INTF_1_B(i) (0x388 + ((i) ? \
+                                        AR_SM1_BASE : AR_SM_BASE))
 /*
  * Channel 2 Register Map
  */
diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
index 611ea6ce8508..d16d029f81a9 100644
--- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
@@ -521,7 +521,7 @@ static const u32 ar9485_1_1_radio_postamble[][2] = {
         {0x000160ac, 0x24611800},
         {0x000160b0, 0x03284f3e},
         {0x0001610c, 0x00170000},
-        {0x00016140, 0x10804008},
+        {0x00016140, 0x50804008},
 };
 
 static const u32 ar9485_1_1_mac_postamble[][5] = {
@@ -603,7 +603,7 @@ static const u32 ar9485_1_1_radio_core[][2] = {
 
 static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
         /* Addr        allmodes */
-        {0x00018c00, 0x10052e5e},
+        {0x00018c00, 0x18052e5e},
         {0x00018c04, 0x000801d8},
         {0x00018c08, 0x0000080c},
 };
@@ -776,7 +776,7 @@ static const u32 ar9485_modes_green_ob_db_tx_gain_1_1[][5] = {
 
 static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
         /* Addr        allmodes */
-        {0x00018c00, 0x10013e5e},
+        {0x00018c00, 0x18013e5e},
         {0x00018c04, 0x000801d8},
         {0x00018c08, 0x0000080c},
 };
@@ -882,7 +882,7 @@ static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
 
 static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
         /* Addr        allmodes  */
-        {0x00018c00, 0x10012e5e},
+        {0x00018c00, 0x18012e5e},
         {0x00018c04, 0x000801d8},
         {0x00018c08, 0x0000080c},
 };
@@ -1021,7 +1021,7 @@ static const u32 ar9485_common_rx_gain_1_1[][2] = {
 
 static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = {
         /* Addr        allmodes */
-        {0x00018c00, 0x10053e5e},
+        {0x00018c00, 0x18053e5e},
         {0x00018c04, 0x000801d8},
         {0x00018c08, 0x0000080c},
 };
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 96b8b9914da1..27471f80d8b2 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1724,6 +1724,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (!ath9k_hw_init_cal(ah, chan))
                 return -EIO;
 
+        ath9k_hw_loadnf(ah, chan);
+        ath9k_hw_start_nfcal(ah, true);
+
         ENABLE_REGWRITE_BUFFER(ah);
 
         ath9k_hw_restore_chainmask(ah);
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index d20946939cd8..59472e1605cd 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -296,7 +296,8 @@ static void carl9170_tx_release(struct kref *ref)
                         super = (void *)skb->data;
                         txinfo->status.ampdu_len = super->s.rix;
                         txinfo->status.ampdu_ack_len = super->s.cnt;
-                } else if (txinfo->flags & IEEE80211_TX_STAT_ACK) {
+                } else if ((txinfo->flags & IEEE80211_TX_STAT_ACK) &&
+                           !(txinfo->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {
                         /*
                          * drop redundant tx_status reports:
                          *
@@ -308,15 +309,17 @@ static void carl9170_tx_release(struct kref *ref)
                          *
                          * 3. minstrel_ht is picky, it only accepts
                          *    reports of frames with the TX_STATUS_AMPDU flag.
+                         *
+                         * 4. mac80211 is not particularly interested in
+                         *    feedback either [CTL_REQ_TX_STATUS not set]
                          */
 
                         dev_kfree_skb_any(skb);
                         return;
                 } else {
                         /*
-                         * Frame has failed, but we want to keep it in
-                         * case it was lost due to a power-state
-                         * transition.
+                         * Either the frame transmission has failed or
+                         * mac80211 requested tx status.
                          */
                 }
         }
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 028310f263c8..f1be57f0f5bb 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -253,6 +253,8 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
         int r;
 
         sband = wiphy->bands[IEEE80211_BAND_2GHZ];
+        if (!sband)
+                return;
 
         /*
          * If no country IE has been received always enable active scan
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index c73e8600d218..5f77cbe0b6aa 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -175,6 +175,7 @@ void b43_generate_plcp_hdr(struct b43_plcp_hdr4 *plcp,
         }
 }
 
+/* TODO: verify if needed for SSLPN or LCN  */
 static u16 b43_generate_tx_phy_ctl1(struct b43_wldev *dev, u8 bitrate)
 {
         const struct b43_phy *phy = &dev->phy;
@@ -256,6 +257,9 @@ int b43_generate_txhdr(struct b43_wldev *dev,
         unsigned int plcp_fragment_len;
         u32 mac_ctl = 0;
         u16 phy_ctl = 0;
+        bool fill_phy_ctl1 = (phy->type == B43_PHYTYPE_LP ||
+                              phy->type == B43_PHYTYPE_N ||
+                              phy->type == B43_PHYTYPE_HT);
         u8 extra_ft = 0;
         struct ieee80211_rate *txrate;
         struct ieee80211_tx_rate *rates;
@@ -531,7 +535,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,
                         extra_ft |= B43_TXH_EFT_RTSFB_CCK;
 
                 if (rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS &&
-                    phy->type == B43_PHYTYPE_N) {
+                    fill_phy_ctl1) {
                         txhdr->phy_ctl1_rts = cpu_to_le16(
                                 b43_generate_tx_phy_ctl1(dev, rts_rate));
                         txhdr->phy_ctl1_rts_fb = cpu_to_le16(
@@ -552,7 +556,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,
                 break;
         }
 
-        if (phy->type == B43_PHYTYPE_N) {
+        if (fill_phy_ctl1) {
                 txhdr->phy_ctl1 =
                         cpu_to_le16(b43_generate_tx_phy_ctl1(dev, rate));
                 txhdr->phy_ctl1_fb =
@@ -736,7 +740,14 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 
         /* Link quality statistics */
         switch (chanstat & B43_RX_CHAN_PHYTYPE) {
+        case B43_PHYTYPE_HT:
+                /* TODO: is max the right choice? */
+                status.signal = max_t(__s8,
+                        max(rxhdr->phy_ht_power0, rxhdr->phy_ht_power1),
+                        rxhdr->phy_ht_power2);
+                break;
         case B43_PHYTYPE_N:
+                /* Broadcom has code for min and avg, but always uses max */
                 if (rxhdr->power0 == 16 || rxhdr->power0 == 32)
                         status.signal = max(rxhdr->power1, rxhdr->power2);
                 else
@@ -827,7 +838,6 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 #endif
         return;
 drop:
-        b43dbg(dev->wl, "RX: Packet dropped\n");
         dev_kfree_skb_any(skb);
 }
 
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h
index 16c514d54afa..98d90747836a 100644
--- a/drivers/net/wireless/b43/xmit.h
+++ b/drivers/net/wireless/b43/xmit.h
@@ -249,6 +249,12 @@ struct b43_rxhdr_fw4 {
                 } __packed;
         } __packed;
         union {
+                /* HT-PHY */
+                struct {
+                        PAD_BYTES(1);
+                        __s8 phy_ht_power0;
+                } __packed;
+
                 /* RSSI for N-PHYs */
                 struct {
                         __s8 power2;
@@ -257,7 +263,15 @@ struct b43_rxhdr_fw4 {
 
                 __le16 phy_status2;     /* PHY RX Status 2 */
         } __packed;
-        __le16 phy_status3;     /* PHY RX Status 3 */
+        union {
+                /* HT-PHY */
+                struct {
+                        __s8 phy_ht_power1;
+                        __s8 phy_ht_power2;
+                } __packed;
+
+                __le16 phy_status3;     /* PHY RX Status 3 */
+        } __packed;
         union {
                 /* Tested with 598.314, 644.1001 and 666.2 */
                 struct {
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index ae541fbb4475..e286fb4d4813 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -358,13 +358,14 @@ static uint nrxdactive(struct dma_info *di, uint h, uint t)
 
 static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags)
 {
-        uint dmactrlflags = di->dma.dmactrlflags;
+        uint dmactrlflags;
 
         if (di == NULL) {
-                DMA_ERROR(("%s: _dma_ctrlflags: NULL dma handle\n", di->name));
+                DMA_ERROR(("_dma_ctrlflags: NULL dma handle\n"));
                 return 0;
         }
 
+        dmactrlflags = di->dma.dmactrlflags;
         dmactrlflags &= ~mask;
         dmactrlflags |= flags;
 
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index ef9ad79d1bfd..127e9c63beaf 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -161,7 +161,7 @@ that only one external action is invoked at a time.
 #include <linux/firmware.h>
 #include <linux/acpi.h>
 #include <linux/ctype.h>
-#include <linux/pm_qos_params.h>
+#include <linux/pm_qos.h>
 
 #include <net/lib80211.h>
 
@@ -174,7 +174,7 @@ that only one external action is invoked at a time.
 #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver"
 #define DRV_COPYRIGHT   "Copyright(c) 2003-2006 Intel Corporation"
 
-static struct pm_qos_request_list ipw2100_pm_qos_req;
+static struct pm_qos_request ipw2100_pm_qos_req;
 
 /* Debugging stuff */
 #ifdef CONFIG_IPW2100_DEBUG
diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c
index 01c88a71abe1..e8c039879b05 100644
--- a/drivers/net/wireless/ipw2x00/libipw_tx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_tx.c
@@ -395,7 +395,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
                     (CFG_LIBIPW_COMPUTE_FCS | CFG_LIBIPW_RESERVE_FCS))
                         bytes_per_frag -= LIBIPW_FCS_LEN;
 
-                /* Each fragment may need to have room for encryptiong
+                /* Each fragment may need to have room for encryption
                  * pre/postfix */
                 if (host_encrypt)
                         bytes_per_frag -= crypt->ops->extra_mpdu_prefix_len +
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index b247a56d5135..001fdf140abb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1755,16 +1755,6 @@ static inline int iwl_check_stuck_queue(struct iwl_priv *priv, int txq)
 {
         if (iwl_trans_check_stuck_queue(trans(priv), txq)) {
                 int ret;
-                if (txq == priv->shrd->cmd_queue) {
-                        /*
-                         * validate command queue still working
-                         * by sending "ECHO" command
-                         */
-                        if (!iwl_cmd_echo_test(priv))
-                                return 0;
-                        else
-                                IWL_DEBUG_HC(priv, "echo testing fail\n");
-                }
                 ret = iwl_force_reset(priv, IWL_FW_RESET, false);
                 return (ret == -EAGAIN) ? 0 : 1;
         }
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 3b6cc66365e5..19cc6a81da57 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -445,10 +445,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
 
         err = pci_enable_msi(pdev);
-        if (err) {
-                dev_printk(KERN_ERR, &pdev->dev, "pci_enable_msi failed");
-                goto out_iounmap;
-        }
+        if (err)
+                dev_printk(KERN_ERR, &pdev->dev,
+                        "pci_enable_msi failed(0X%x)", err);
 
         /* TODO: Move this away, not needed if not MSI */
         /* enable rfkill interrupt: hw bug w/a */
@@ -469,7 +468,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 out_disable_msi:
         pci_disable_msi(pdev);
-out_iounmap:
         pci_iounmap(pdev, pci_bus->hw_base);
 out_pci_release_regions:
         pci_set_drvdata(pdev, NULL);
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 8e8c75c997ee..da3411057afc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -407,6 +407,7 @@ static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)
         struct iwl_queue *q = &txq->q;
         enum dma_data_direction dma_dir;
         unsigned long flags;
+        spinlock_t *lock;
 
         if (!q->n_bd)
                 return;
@@ -414,19 +415,22 @@ static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)
         /* In the command queue, all the TBs are mapped as BIDI
          * so unmap them as such.
          */
-        if (txq_id == trans->shrd->cmd_queue)
+        if (txq_id == trans->shrd->cmd_queue) {
                 dma_dir = DMA_BIDIRECTIONAL;
-        else
+                lock = &trans->hcmd_lock;
+        } else {
                 dma_dir = DMA_TO_DEVICE;
+                lock = &trans->shrd->sta_lock;
+        }
 
-        spin_lock_irqsave(&trans->shrd->sta_lock, flags);
+        spin_lock_irqsave(lock, flags);
         while (q->write_ptr != q->read_ptr) {
                 /* The read_ptr needs to bound by q->n_window */
                 iwlagn_txq_free_tfd(trans, txq, get_cmd_index(q, q->read_ptr),
                                     dma_dir);
                 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd);
         }
-        spin_unlock_irqrestore(&trans->shrd->sta_lock, flags);
+        spin_unlock_irqrestore(lock, flags);
 }
 
 /**
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index ff6378276ff0..4fcd653bddc4 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -728,15 +728,9 @@ static void lbs_scan_worker(struct work_struct *work)
                 le16_to_cpu(scan_cmd->hdr.size),
                 lbs_ret_scan, 0);
 
-        if (priv->scan_channel >= priv->scan_req->n_channels) {
+        if (priv->scan_channel >= priv->scan_req->n_channels)
                 /* Mark scan done */
-                if (priv->internal_scan)
-                        kfree(priv->scan_req);
-                else
-                        cfg80211_scan_done(priv->scan_req, false);
-
-                priv->scan_req = NULL;
-        }
+                lbs_scan_done(priv);
 
         /* Restart network */
         if (carrier)
@@ -774,6 +768,21 @@ static void _internal_start_scan(struct lbs_private *priv, bool internal,
         lbs_deb_leave(LBS_DEB_CFG80211);
 }
 
+/*
+ * Clean up priv->scan_req.  Should be used to handle the allocation details.
+ */
+void lbs_scan_done(struct lbs_private *priv)
+{
+        WARN_ON(!priv->scan_req);
+
+        if (priv->internal_scan)
+                kfree(priv->scan_req);
+        else
+                cfg80211_scan_done(priv->scan_req, false);
+
+        priv->scan_req = NULL;
+}
+
 static int lbs_cfg_scan(struct wiphy *wiphy,
         struct net_device *dev,
         struct cfg80211_scan_request *request)
diff --git a/drivers/net/wireless/libertas/cfg.h b/drivers/net/wireless/libertas/cfg.h
index a02ee151710e..558168ce634d 100644
--- a/drivers/net/wireless/libertas/cfg.h
+++ b/drivers/net/wireless/libertas/cfg.h
@@ -16,6 +16,7 @@ int lbs_reg_notifier(struct wiphy *wiphy,
 void lbs_send_disconnect_notification(struct lbs_private *priv);
 void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);
 
+void lbs_scan_done(struct lbs_private *priv);
 void lbs_scan_deinit(struct lbs_private *priv);
 int lbs_disconnect(struct lbs_private *priv, u16 reason);
 
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b03779bcd547..39a6a7a40244 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -255,10 +255,8 @@ static int lbs_eth_stop(struct net_device *dev)
 
         lbs_update_mcast(priv);
         cancel_delayed_work_sync(&priv->scan_work);
-        if (priv->scan_req) {
-                cfg80211_scan_done(priv->scan_req, false);
-                priv->scan_req = NULL;
-        }
+        if (priv->scan_req)
+                lbs_scan_done(priv);
 
         netif_carrier_off(priv->dev);
 
diff --git a/drivers/net/wireless/libertas_tf/deb_defs.h b/drivers/net/wireless/libertas_tf/deb_defs.h
index ae753962d8b5..4bd3dc5adf7c 100644
--- a/drivers/net/wireless/libertas_tf/deb_defs.h
+++ b/drivers/net/wireless/libertas_tf/deb_defs.h
@@ -3,7 +3,7 @@
   * global variable declaration.
   */
 #ifndef _LBS_DEB_DEFS_H_
-#define _LBS_DEB_EFS_H_
+#define _LBS_DEB_DEFS_H_
 
 #ifndef DRV_NAME
 #define DRV_NAME "libertas_tf"
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index dae8dbb24a03..8a3f9598ad33 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1469,7 +1469,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
                                s32 rssi, const u8 *ie_buf, size_t ie_len,
                                u16 beacon_period, u16 cap_info_bitmap, u8 band)
 {
-        struct mwifiex_bssdescriptor *bss_desc = NULL;
+        struct mwifiex_bssdescriptor *bss_desc;
         int ret;
         unsigned long flags;
         u8 *beacon_ie;
@@ -1484,6 +1484,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
 
         beacon_ie = kmemdup(ie_buf, ie_len, GFP_KERNEL);
         if (!beacon_ie) {
+                kfree(bss_desc);
                 dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n");
                 return -ENOMEM;
         }
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 5380f3b040ac..177a8e669241 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -475,7 +475,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct sk_buff *skb = NULL;
         struct ieee80211_tx_info *info = NULL;
-        int tid; /* should be int */
+        int tid;
 
         if (!rtlpriv->rtlhal.earlymode_enable)
                 return;
@@ -1525,7 +1525,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
 
         rtl_init_rx_config(hw);
 
-        /*should after adapter start and interrupt enable. */
+        /*should be after adapter start and interrupt enable. */
         set_hal_start(rtlhal);
 
         RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
@@ -1546,7 +1546,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
         u8 RFInProgressTimeOut = 0;
 
         /*
-         *should before disable interrrupt&adapter
+         *should be before disable interrupt&adapter
          *and will do it immediately.
          */
         set_hal_stop(rtlhal);
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 128ccb79318c..fc29c671cf3b 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -559,7 +559,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
                                                 break;
                                         }
                                 /* Fail if SSID isn't present in the filters */
-                                if (j == req->n_ssids) {
+                                if (j == cmd->n_ssids) {
                                         ret = -EINVAL;
                                         goto out_free;
                                 }