Merge branch 'next' into for-linus

183 files changed, 3474 insertions, 2103 deletions

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index fbc231153e55..77cf0901a441 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -56,6 +56,7 @@ static const char version[] =
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/init.h>
@@ -734,8 +735,7 @@ static void init_82586_mem(struct net_device *dev)
         memcpy_toio(lp->base, init_words + 5, sizeof(init_words) - 10);
 
         /* Fill in the station address. */
-        memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr,
-                   sizeof(dev->dev_addr));
+        memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr, ETH_ALEN);
 
         /* The Tx-block list is written as needed.  We just set up the values. */
         lp->tx_cmd_link = IDLELOOP + 4;
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 78b7167a8ce3..39db0e96815d 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -837,7 +837,7 @@ static int vortex_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops vortex_pm_ops = {
+static const struct dev_pm_ops vortex_pm_ops = {
         .suspend = vortex_suspend,
         .resume = vortex_resume,
         .freeze = vortex_suspend,
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a5be9ac6405c..dd9a09c72dff 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1953,6 +1953,8 @@ config BCM63XX_ENET
 
 source "drivers/net/fs_enet/Kconfig"
 
+source "drivers/net/octeon/Kconfig"
+
 endif # NET_ETHERNET
 
 #
@@ -2344,6 +2346,7 @@ config GELIC_NET
 
 config GELIC_WIRELESS
         bool "PS3 Wireless support"
+        depends on WLAN
         depends on GELIC_NET
         select WIRELESS_EXT
         help
@@ -2356,6 +2359,7 @@ config GELIC_WIRELESS
 config GELIC_WIRELESS_OLD_PSK_INTERFACE
        bool "PS3 Wireless private PSK interface (OBSOLETE)"
        depends on GELIC_WIRELESS
+       select WEXT_PRIV
        help
           This option retains the obsolete private interface to pass
           the PSK from user space programs to the driver.  The PSK
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 246323d7f161..ad1346dd9da9 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -285,3 +285,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 obj-$(CONFIG_SFC) += sfc/
 
 obj-$(CONFIG_WIMAX) += wimax/
+
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index c37ee9e6b67b..39e1c0d39476 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -68,6 +68,7 @@ config W90P910_ETH
         tristate "Nuvoton w90p910 Ethernet support"
         depends on ARM && ARCH_W90X900
         select PHYLIB
+        select MII
         help
           Say Y here if you want to use built-in Ethernet ports
           on w90p910 processor.
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index c5721cb38265..cc9ed8643910 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -663,7 +663,7 @@ static int lance_open( struct net_device *dev )
         while (--i > 0)
                 if (DREG & CSR0_IDON)
                         break;
-        if (i < 0 || (DREG & CSR0_ERR)) {
+        if (i <= 0 || (DREG & CSR0_ERR)) {
                 DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n",
                                           dev->name, i, DREG ));
                 DREG = CSR0_STOP;
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index c0451d75cdcf..ec52529394ad 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1959,12 +1959,15 @@ static int atl2_get_eeprom(struct net_device *netdev,
                 return -ENOMEM;
 
         for (i = first_dword; i < last_dword; i++) {
-                if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword])))
-                        return -EIO;
+                if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) {
+                        ret_val = -EIO;
+                        goto free;
+                }
         }
 
         memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),
                 eeprom->len);
+free:
         kfree(eeprom_buff);
 
         return ret_val;
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 1f6c5486d715..0bd47d32ec42 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1245,9 +1245,15 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev,
         drvinfo->n_stats = BCM_ENET_STATS_LEN;
 }
 
-static int bcm_enet_get_stats_count(struct net_device *netdev)
+static int bcm_enet_get_sset_count(struct net_device *netdev,
+                                        int string_set)
 {
-        return BCM_ENET_STATS_LEN;
+        switch (string_set) {
+        case ETH_SS_STATS:
+                return BCM_ENET_STATS_LEN;
+        default:
+                return -EINVAL;
+        }
 }
 
 static void bcm_enet_get_strings(struct net_device *netdev,
@@ -1473,7 +1479,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev,
 
 static struct ethtool_ops bcm_enet_ethtool_ops = {
         .get_strings            = bcm_enet_get_strings,
-        .get_stats_count        = bcm_enet_get_stats_count,
+        .get_sset_count         = bcm_enet_get_sset_count,
         .get_ethtool_stats      = bcm_enet_get_ethtool_stats,
         .get_settings           = bcm_enet_get_settings,
         .set_settings           = bcm_enet_set_settings,
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 9e56014d27ed..9fd8e5ecd5d7 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -275,6 +275,7 @@ struct be_adapter {
         u32 tx_fc;              /* Tx flow control */
         int link_speed;
         u8 port_type;
+        u8 transceiver;
 };
 
 extern const struct ethtool_ops be_ethtool_ops;
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 1b68bd98dc0c..102ade134165 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1479,6 +1479,41 @@ err:
         return status;
 }
 
+int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
+                        u8 loopback_type, u8 enable)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_set_lmode *req;
+        int status;
+
+        spin_lock_bh(&adapter->mcc_lock);
+
+        wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+
+        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));
+
+        req->src_port = port_num;
+        req->dest_port = port_num;
+        req->loopback_type = loopback_type;
+        req->loopback_state = enable;
+
+        status = be_mcc_notify_wait(adapter);
+err:
+        spin_unlock_bh(&adapter->mcc_lock);
+        return status;
+}
+
 int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,
                 u32 loopback_type, u32 pkt_size, u32 num_pkts, u64 pattern)
 {
@@ -1501,6 +1536,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,
 
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
                         OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));
+        req->hdr.timeout = 4;
 
         req->pattern = cpu_to_le64(pattern);
         req->src_port = cpu_to_le32(port_num);
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 92b87ef156ed..c002b8391b4d 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -155,6 +155,7 @@ struct be_mcc_mailbox {
 
 #define OPCODE_LOWLEVEL_HOST_DDR_DMA                    17
 #define OPCODE_LOWLEVEL_LOOPBACK_TEST                   18
+#define OPCODE_LOWLEVEL_SET_LOOPBACK_MODE               19
 
 struct be_cmd_req_hdr {
         u8 opcode;              /* dword 0 */
@@ -821,6 +822,19 @@ struct be_cmd_resp_loopback_test {
         u32    ticks_compl;
 };
 
+struct be_cmd_req_set_lmode {
+        struct be_cmd_req_hdr hdr;
+        u8 src_port;
+        u8 dest_port;
+        u8 loopback_type;
+        u8 loopback_state;
+};
+
+struct be_cmd_resp_set_lmode {
+        struct be_cmd_resp_hdr resp_hdr;
+        u8 rsvd0[4];
+};
+
 /********************** DDR DMA test *********************/
 struct be_cmd_req_ddrdma_test {
         struct be_cmd_req_hdr hdr;
@@ -912,3 +926,5 @@ extern int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,
                                 u32 num_pkts, u64 pattern);
 extern int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,
                         u32 byte_cnt, struct be_dma_mem *cmd);
+extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
+                                u8 loopback_type, u8 enable);
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 298b92cbd689..5d001c4deac1 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -118,6 +118,7 @@ static const char et_self_tests[][ETH_GSTRING_LEN] = {
 #define BE_MAC_LOOPBACK 0x0
 #define BE_PHY_LOOPBACK 0x1
 #define BE_ONE_PORT_EXT_LOOPBACK 0x2
+#define BE_NO_LOOPBACK 0xff
 
 static void
 be_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
@@ -339,28 +340,50 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 
                 status = be_cmd_read_port_type(adapter, adapter->port_num,
                                                 &connector);
-                switch (connector) {
-                case 7:
-                        ecmd->port = PORT_FIBRE;
-                        break;
-                default:
-                        ecmd->port = PORT_TP;
-                        break;
+                if (!status) {
+                        switch (connector) {
+                        case 7:
+                                ecmd->port = PORT_FIBRE;
+                                ecmd->transceiver = XCVR_EXTERNAL;
+                                break;
+                        case 0:
+                                ecmd->port = PORT_TP;
+                                ecmd->transceiver = XCVR_EXTERNAL;
+                                break;
+                        default:
+                                ecmd->port = PORT_TP;
+                                ecmd->transceiver = XCVR_INTERNAL;
+                                break;
+                        }
+                } else {
+                        ecmd->port = PORT_AUI;
+                        ecmd->transceiver = XCVR_INTERNAL;
                 }
 
                 /* Save for future use */
                 adapter->link_speed = ecmd->speed;
                 adapter->port_type = ecmd->port;
+                adapter->transceiver = ecmd->transceiver;
         } else {
                 ecmd->speed = adapter->link_speed;
                 ecmd->port = adapter->port_type;
+                ecmd->transceiver = adapter->transceiver;
         }
 
         ecmd->duplex = DUPLEX_FULL;
         ecmd->autoneg = AUTONEG_DISABLE;
-        ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_TP);
         ecmd->phy_address = adapter->port_num;
-        ecmd->transceiver = XCVR_INTERNAL;
+        switch (ecmd->port) {
+        case PORT_FIBRE:
+                ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
+                break;
+        case PORT_TP:
+                ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_TP);
+                break;
+        case PORT_AUI:
+                ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_AUI);
+                break;
+        }
 
         return 0;
 }
@@ -489,6 +512,19 @@ err:
         return ret;
 }
 
+static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type,
+                                u64 *status)
+{
+        be_cmd_set_loopback(adapter, adapter->port_num,
+                                loopback_type, 1);
+        *status = be_cmd_loopback_test(adapter, adapter->port_num,
+                                loopback_type, 1500,
+                                2, 0xabc);
+        be_cmd_set_loopback(adapter, adapter->port_num,
+                                BE_NO_LOOPBACK, 1);
+        return *status;
+}
+
 static void
 be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
 {
@@ -497,23 +533,18 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
         memset(data, 0, sizeof(u64) * ETHTOOL_TESTS_NUM);
 
         if (test->flags & ETH_TEST_FL_OFFLINE) {
-                data[0] = be_cmd_loopback_test(adapter, adapter->port_num,
-                                                BE_MAC_LOOPBACK, 1500,
-                                                2, 0xabc);
-                if (data[0] != 0)
+                if (be_loopback_test(adapter, BE_MAC_LOOPBACK,
+                                                &data[0]) != 0) {
                         test->flags |= ETH_TEST_FL_FAILED;
-
-                data[1] = be_cmd_loopback_test(adapter, adapter->port_num,
-                                                BE_PHY_LOOPBACK, 1500,
-                                                2, 0xabc);
-                if (data[1] != 0)
+                }
+                if (be_loopback_test(adapter, BE_PHY_LOOPBACK,
+                                                &data[1]) != 0) {
                         test->flags |= ETH_TEST_FL_FAILED;
-
-                data[2] = be_cmd_loopback_test(adapter, adapter->port_num,
-                                                BE_ONE_PORT_EXT_LOOPBACK,
-                                                1500, 2, 0xabc);
-                if (data[2] != 0)
+                }
+                if (be_loopback_test(adapter, BE_ONE_PORT_EXT_LOOPBACK,
+                                                &data[2]) != 0) {
                         test->flags |= ETH_TEST_FL_FAILED;
+                }
 
                 data[3] = be_test_ddr_dma(adapter);
                 if (data[3] != 0)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 4bfc80812926..65df1de447e4 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -653,12 +653,20 @@ static void
 bnx2_netif_stop(struct bnx2 *bp)
 {
         bnx2_cnic_stop(bp);
-        bnx2_disable_int_sync(bp);
         if (netif_running(bp->dev)) {
+                int i;
+
                 bnx2_napi_disable(bp);
                 netif_tx_disable(bp->dev);
-                bp->dev->trans_start = jiffies; /* prevent tx timeout */
+                /* prevent tx timeout */
+                for (i = 0; i <  bp->dev->num_tx_queues; i++) {
+                        struct netdev_queue *txq;
+
+                        txq = netdev_get_tx_queue(bp->dev, i);
+                        txq->trans_start = jiffies;
+                }
         }
+        bnx2_disable_int_sync(bp);
 }
 
 static void
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 77ba13520d87..306c2b8165e2 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -7593,6 +7593,8 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 if (bp->cnic_eth_dev.drv_state & CNIC_DRV_STATE_REGD) {
                         bnx2x_set_iscsi_eth_mac_addr(bp, 1);
                         bp->cnic_flags |= BNX2X_CNIC_FLAG_MAC_SET;
+                        bnx2x_init_sb(bp, bp->cnic_sb, bp->cnic_sb_mapping,
+                                      CNIC_SB_ID(bp));
                 }
                 mutex_unlock(&bp->cnic_mutex);
 #endif
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index d69e6838f21e..822f586d72af 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
@@ -352,7 +354,8 @@ static u16 __get_link_speed(struct port *port)
                 }
         }
 
-        pr_debug("Port %d Received link speed %d update from adapter\n", port->actor_port_number, speed);
+        pr_debug("Port %d Received link speed %d update from adapter\n",
+                 port->actor_port_number, speed);
         return speed;
 }
 
@@ -378,12 +381,14 @@ static u8 __get_duplex(struct port *port)
                 switch (slave->duplex) {
                 case DUPLEX_FULL:
                         retval=0x1;
-                        pr_debug("Port %d Received status full duplex update from adapter\n", port->actor_port_number);
+                        pr_debug("Port %d Received status full duplex update from adapter\n",
+                                 port->actor_port_number);
                         break;
                 case DUPLEX_HALF:
                 default:
                         retval=0x0;
-                        pr_debug("Port %d Received status NOT full duplex update from adapter\n", port->actor_port_number);
+                        pr_debug("Port %d Received status NOT full duplex update from adapter\n",
+                                 port->actor_port_number);
                         break;
                 }
         }
@@ -980,7 +985,9 @@ static void ad_mux_machine(struct port *port)
 
         // check if the state machine was changed
         if (port->sm_mux_state != last_state) {
-                pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
+                pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_mux_state);
                 switch (port->sm_mux_state) {
                 case AD_MUX_DETACHED:
                         __detach_bond_from_agg(port);
@@ -1079,7 +1086,9 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
 
         // check if the State machine was changed or new lacpdu arrived
         if ((port->sm_rx_state != last_state) || (lacpdu)) {
-                pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
+                pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_rx_state);
                 switch (port->sm_rx_state) {
                 case AD_RX_INITIALIZE:
                         if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {
@@ -1126,9 +1135,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         // detect loopback situation
                         if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
                                 // INFO_RECEIVED_LOOPBACK_FRAMES
-                                pr_err(DRV_NAME ": %s: An illegal loopback occurred on "
-                                       "adapter (%s). Check the configuration to verify that all "
-                                       "Adapters are connected to 802.3ad compliant switch ports\n",
+                                pr_err("%s: An illegal loopback occurred on adapter (%s).\n"
+                                       "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
                                        port->slave->dev->master->name, port->slave->dev->name);
                                 __release_rx_machine_lock(port);
                                 return;
@@ -1166,7 +1174,8 @@ static void ad_tx_machine(struct port *port)
                         __update_lacpdu_from_port(port);
 
                         if (ad_lacpdu_send(port) >= 0) {
-                                pr_debug("Sent LACPDU on port %d\n", port->actor_port_number);
+                                pr_debug("Sent LACPDU on port %d\n",
+                                         port->actor_port_number);
 
                                 /* mark ntt as false, so it will not be sent again until
                                    demanded */
@@ -1241,7 +1250,9 @@ static void ad_periodic_machine(struct port *port)
 
         // check if the state machine was changed
         if (port->sm_periodic_state != last_state) {
-                pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
+                pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_periodic_state);
                 switch (port->sm_periodic_state) {
                 case AD_NO_PERIODIC:
                         port->sm_periodic_timer_counter = 0;       // zero timer
@@ -1298,7 +1309,9 @@ static void ad_port_selection_logic(struct port *port)
                                 port->next_port_in_aggregator=NULL;
                                 port->actor_port_aggregator_identifier=0;
 
-                                pr_debug("Port %d left LAG %d\n", port->actor_port_number, temp_aggregator->aggregator_identifier);
+                                pr_debug("Port %d left LAG %d\n",
+                                         port->actor_port_number,
+                                         temp_aggregator->aggregator_identifier);
                                 // if the aggregator is empty, clear its parameters, and set it ready to be attached
                                 if (!temp_aggregator->lag_ports) {
                                         ad_clear_agg(temp_aggregator);
@@ -1307,9 +1320,7 @@ static void ad_port_selection_logic(struct port *port)
                         }
                 }
                 if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
-                        pr_warning(DRV_NAME ": %s: Warning: Port %d (on %s) "
-                                   "was related to aggregator %d but was not "
-                                   "on its port list\n",
+                        pr_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
                                    port->slave->dev->master->name,
                                    port->actor_port_number,
                                    port->slave->dev->name,
@@ -1343,7 +1354,9 @@ static void ad_port_selection_logic(struct port *port)
                         port->next_port_in_aggregator=aggregator->lag_ports;
                         port->aggregator->num_of_ports++;
                         aggregator->lag_ports=port;
-                        pr_debug("Port %d joined LAG %d(existing LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                        pr_debug("Port %d joined LAG %d(existing LAG)\n",
+                                 port->actor_port_number,
+                                 port->aggregator->aggregator_identifier);
 
                         // mark this port as selected
                         port->sm_vars |= AD_PORT_SELECTED;
@@ -1380,10 +1393,11 @@ static void ad_port_selection_logic(struct port *port)
                         // mark this port as selected
                         port->sm_vars |= AD_PORT_SELECTED;
 
-                        pr_debug("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                        pr_debug("Port %d joined LAG %d(new LAG)\n",
+                                 port->actor_port_number,
+                                 port->aggregator->aggregator_identifier);
                 } else {
-                        pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "
-                               "a suitable aggregator\n",
+                        pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
                                port->slave->dev->master->name,
                                port->actor_port_number, port->slave->dev->name);
                 }
@@ -1460,8 +1474,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
                 break;
 
         default:
-                pr_warning(DRV_NAME
-                           ": %s: Impossible agg select mode %d\n",
+                pr_warning("%s: Impossible agg select mode %d\n",
                            curr->slave->dev->master->name,
                            __get_agg_selection_mode(curr->lag_ports));
                 break;
@@ -1546,40 +1559,38 @@ static void ad_agg_selection_logic(struct aggregator *agg)
         // if there is new best aggregator, activate it
         if (best) {
                 pr_debug("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                       best->aggregator_identifier, best->num_of_ports,
-                       best->actor_oper_aggregator_key,
-                       best->partner_oper_aggregator_key,
-                       best->is_individual, best->is_active);
+                         best->aggregator_identifier, best->num_of_ports,
+                         best->actor_oper_aggregator_key,
+                         best->partner_oper_aggregator_key,
+                         best->is_individual, best->is_active);
                 pr_debug("best ports %p slave %p %s\n",
-                       best->lag_ports, best->slave,
-                       best->slave ? best->slave->dev->name : "NULL");
+                         best->lag_ports, best->slave,
+                         best->slave ? best->slave->dev->name : "NULL");
 
                 for (agg = __get_first_agg(best->lag_ports); agg;
                      agg = __get_next_agg(agg)) {
 
                         pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                                agg->aggregator_identifier, agg->num_of_ports,
-                                agg->actor_oper_aggregator_key,
-                                agg->partner_oper_aggregator_key,
-                                agg->is_individual, agg->is_active);
+                                 agg->aggregator_identifier, agg->num_of_ports,
+                                 agg->actor_oper_aggregator_key,
+                                 agg->partner_oper_aggregator_key,
+                                 agg->is_individual, agg->is_active);
                 }
 
                 // check if any partner replys
                 if (best->is_individual) {
-                        pr_warning(DRV_NAME ": %s: Warning: No 802.3ad"
-                               " response from the link partner for any"
-                               " adapters in the bond\n",
-                               best->slave->dev->master->name);
+                        pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
+                                   best->slave ? best->slave->dev->master->name : "NULL");
                 }
 
                 best->is_active = 1;
                 pr_debug("LAG %d chosen as the active LAG\n",
-                        best->aggregator_identifier);
+                         best->aggregator_identifier);
                 pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                        best->aggregator_identifier, best->num_of_ports,
-                        best->actor_oper_aggregator_key,
-                        best->partner_oper_aggregator_key,
-                        best->is_individual, best->is_active);
+                         best->aggregator_identifier, best->num_of_ports,
+                         best->actor_oper_aggregator_key,
+                         best->partner_oper_aggregator_key,
+                         best->is_individual, best->is_active);
 
                 // disable the ports that were related to the former active_aggregator
                 if (active) {
@@ -1633,7 +1644,8 @@ static void ad_clear_agg(struct aggregator *aggregator)
                 aggregator->lag_ports = NULL;
                 aggregator->is_active = 0;
                 aggregator->num_of_ports = 0;
-                pr_debug("LAG %d was cleared\n", aggregator->aggregator_identifier);
+                pr_debug("LAG %d was cleared\n",
+                         aggregator->aggregator_identifier);
         }
 }
 
@@ -1728,7 +1740,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
 static void ad_enable_collecting_distributing(struct port *port)
 {
         if (port->aggregator->is_active) {
-                pr_debug("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                pr_debug("Enabling port %d(LAG %d)\n",
+                         port->actor_port_number,
+                         port->aggregator->aggregator_identifier);
                 __enable_port(port);
         }
 }
@@ -1741,7 +1755,9 @@ static void ad_enable_collecting_distributing(struct port *port)
 static void ad_disable_collecting_distributing(struct port *port)
 {
         if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {
-                pr_debug("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                pr_debug("Disabling port %d(LAG %d)\n",
+                         port->actor_port_number,
+                         port->aggregator->aggregator_identifier);
                 __disable_port(port);
         }
 }
@@ -1779,7 +1795,8 @@ static void ad_marker_info_send(struct port *port)
 
         // send the marker information
         if (ad_marker_send(port, &marker) >= 0) {
-                pr_debug("Sent Marker Information on port %d\n", port->actor_port_number);
+                pr_debug("Sent Marker Information on port %d\n",
+                         port->actor_port_number);
         }
 }
 #endif
@@ -1803,7 +1820,8 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
         // send the marker response
 
         if (ad_marker_send(port, &marker) >= 0) {
-                pr_debug("Sent Marker Response on port %d\n", port->actor_port_number);
+                pr_debug("Sent Marker Response on port %d\n",
+                         port->actor_port_number);
         }
 }
 
@@ -1889,8 +1907,7 @@ int bond_3ad_bind_slave(struct slave *slave)
         struct aggregator *aggregator;
 
         if (bond == NULL) {
-                pr_err(DRV_NAME ": %s: The slave %s is not attached to "
-                       "its bond\n",
+                pr_err("%s: The slave %s is not attached to its bond\n",
                        slave->dev->master->name, slave->dev->name);
                 return -1;
         }
@@ -1966,13 +1983,13 @@ void bond_3ad_unbind_slave(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: Trying to "
-                           "unbind an uninitialized port on %s\n",
+                pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
 
-        pr_debug("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);
+        pr_debug("Unbinding Link Aggregation Group %d\n",
+                 aggregator->aggregator_identifier);
 
         /* Tell the partner that this port is not suitable for aggregation */
         port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
@@ -1996,10 +2013,12 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         // if new aggregator found, copy the aggregator's parameters
                         // and connect the related lag_ports to the new aggregator
                         if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
-                                pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
+                                pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n",
+                                         aggregator->aggregator_identifier,
+                                         new_aggregator->aggregator_identifier);
 
                                 if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
-                                        pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                        pr_info("%s: Removing an active aggregator\n",
                                                 aggregator->slave->dev->master->name);
                                         // select new active aggregator
                                          select_new_active_agg = 1;
@@ -2030,8 +2049,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         ad_agg_selection_logic(__get_first_agg(port));
                                 }
                         } else {
-                                pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "
-                                           "and could not find a new aggregator for its ports\n",
+                                pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",
                                            slave->dev->master->name);
                         }
                 } else { // in case that the only port related to this aggregator is the one we want to remove
@@ -2039,7 +2057,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         // clear the aggregator
                         ad_clear_agg(aggregator);
                         if (select_new_active_agg) {
-                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                pr_info("%s: Removing an active aggregator\n",
                                         slave->dev->master->name);
                                 // select new active aggregator
                                 ad_agg_selection_logic(__get_first_agg(port));
@@ -2066,7 +2084,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         // clear the aggregator
                                         ad_clear_agg(temp_aggregator);
                                         if (select_new_active_agg) {
-                                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                                pr_info("%s: Removing an active aggregator\n",
                                                         slave->dev->master->name);
                                                 // select new active aggregator
                                                 ad_agg_selection_logic(__get_first_agg(port));
@@ -2115,8 +2133,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
                 // select the active aggregator for the bond
                 if ((port = __get_first_port(bond))) {
                         if (!port->slave) {
-                                pr_warning(DRV_NAME ": %s: Warning: bond's first port is "
-                                           "uninitialized\n", bond->dev->name);
+                                pr_warning("%s: Warning: bond's first port is uninitialized\n",
+                                           bond->dev->name);
                                 goto re_arm;
                         }
 
@@ -2129,8 +2147,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
         // for each port run the state machines
         for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
                 if (!port->slave) {
-                        pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "
-                                   "port\n", bond->dev->name);
+                        pr_warning("%s: Warning: Found an uninitialized port\n",
+                                   bond->dev->name);
                         goto re_arm;
                 }
 
@@ -2171,15 +2189,15 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 port = &(SLAVE_AD_INFO(slave).port);
 
                 if (!port->slave) {
-                        pr_warning(DRV_NAME ": %s: Warning: port of slave %s "
-                                   "is uninitialized\n",
+                        pr_warning("%s: Warning: port of slave %s is uninitialized\n",
                                    slave->dev->name, slave->dev->master->name);
                         return;
                 }
 
                 switch (lacpdu->subtype) {
                 case AD_TYPE_LACPDU:
-                        pr_debug("Received LACPDU on port %d\n", port->actor_port_number);
+                        pr_debug("Received LACPDU on port %d\n",
+                                 port->actor_port_number);
                         ad_rx_machine(lacpdu, port);
                         break;
 
@@ -2188,17 +2206,20 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
 
                         switch (((struct bond_marker *)lacpdu)->tlv_type) {
                         case AD_MARKER_INFORMATION_SUBTYPE:
-                                pr_debug("Received Marker Information on port %d\n", port->actor_port_number);
+                                pr_debug("Received Marker Information on port %d\n",
+                                         port->actor_port_number);
                                 ad_marker_info_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         case AD_MARKER_RESPONSE_SUBTYPE:
-                                pr_debug("Received Marker Response on port %d\n", port->actor_port_number);
+                                pr_debug("Received Marker Response on port %d\n",
+                                         port->actor_port_number);
                                 ad_marker_response_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         default:
-                                pr_debug("Received an unknown Marker subtype on slot %d\n", port->actor_port_number);
+                                pr_debug("Received an unknown Marker subtype on slot %d\n",
+                                         port->actor_port_number);
                         }
                 }
         }
@@ -2218,8 +2239,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: speed "
-                           "changed for uninitialized port on %s\n",
+                pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2246,8 +2266,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": %s: Warning: duplex changed "
-                           "for uninitialized port on %s\n",
+                pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2275,8 +2294,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: link status changed for "
-                           "uninitialized port on %s\n",
+                pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2381,8 +2399,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                pr_debug(DRV_NAME ": %s: Error: "
-                         "bond_3ad_get_active_agg_info failed\n", dev->name);
+                pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",
+                         dev->name);
                 goto out;
         }
 
@@ -2391,8 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 
         if (slaves_in_agg == 0) {
                 /*the aggregator is empty*/
-                pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",
-                         dev->name);
+                pr_debug("%s: Error: active aggregator is empty\n", dev->name);
                 goto out;
         }
 
@@ -2410,8 +2427,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (slave_agg_no >= 0) {
-                pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
-                       "for aggregator ID %d\n", dev->name, agg_id);
+                pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
+                       dev->name, agg_id);
                 goto out;
         }
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 00ab51ef3129..40fdc41446cc 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -201,8 +203,7 @@ static int tlb_initialize(struct bonding *bond)
 
         new_hashtbl = kzalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to allocate TLB hash table\n",
+                pr_err("%s: Error: Failed to allocate TLB hash table\n",
                        bond->dev->name);
                 return -1;
         }
@@ -514,8 +515,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                                  client_info->slave->dev->dev_addr,
                                  client_info->mac_dst);
                 if (!skb) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: failed to create an ARP packet\n",
+                        pr_err("%s: Error: failed to create an ARP packet\n",
                                client_info->slave->dev->master->name);
                         continue;
                 }
@@ -525,8 +525,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                 if (client_info->tag) {
                         skb = vlan_put_tag(skb, client_info->vlan_id);
                         if (!skb) {
-                                pr_err(DRV_NAME
-                                       ": %s: Error: failed to insert VLAN tag\n",
+                                pr_err("%s: Error: failed to insert VLAN tag\n",
                                        client_info->slave->dev->master->name);
                                 continue;
                         }
@@ -609,9 +608,7 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)
                 client_info = &(bond_info->rx_hashtbl[hash_index]);
 
                 if (!client_info->slave) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: found a client with no channel in "
-                               "the client's hash table\n",
+                        pr_err("%s: Error: found a client with no channel in the client's hash table\n",
                                bond->dev->name);
                         continue;
                 }
@@ -806,8 +803,7 @@ static int rlb_initialize(struct bonding *bond)
 
         new_hashtbl = kmalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to allocate RLB hash table\n",
+                pr_err("%s: Error: Failed to allocate RLB hash table\n",
                        bond->dev->name);
                 return -1;
         }
@@ -928,8 +924,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
 
                         skb = vlan_put_tag(skb, vlan->vlan_id);
                         if (!skb) {
-                                pr_err(DRV_NAME
-                                       ": %s: Error: failed to insert VLAN tag\n",
+                                pr_err("%s: Error: failed to insert VLAN tag\n",
                                        bond->dev->name);
                                 continue;
                         }
@@ -958,11 +953,8 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
         memcpy(s_addr.sa_data, addr, dev->addr_len);
         s_addr.sa_family = dev->type;
         if (dev_set_mac_address(dev, &s_addr)) {
-                pr_err(DRV_NAME
-                       ": %s: Error: dev_set_mac_address of dev %s failed! ALB "
-                       "mode requires that the base driver support setting "
-                       "the hw address also when the network device's "
-                       "interface is open\n",
+                pr_err("%s: Error: dev_set_mac_address of dev %s failed!\n"
+                       "ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
                        dev->master->name, dev->name);
                 return -EOPNOTSUPP;
         }
@@ -1169,18 +1161,12 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
                 alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
                                        bond->alb_info.rlb_enabled);
 
-                pr_warning(DRV_NAME
-                           ": %s: Warning: the hw address of slave %s is "
-                           "in use by the bond; giving it the hw address "
-                           "of %s\n",
+                pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
                            bond->dev->name, slave->dev->name,
                            free_mac_slave->dev->name);
 
         } else if (has_bond_addr) {
-                pr_err(DRV_NAME
-                       ": %s: Error: the hw address of slave %s is in use by the "
-                       "bond; couldn't find a slave with a free hw address to "
-                       "give it (this should not have happened)\n",
+                pr_err("%s: Error: the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",
                        bond->dev->name, slave->dev->name);
                 return -EFAULT;
         }
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index b72e1dc8cf8f..6dd64cf3cb76 100644
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/if_vlan.h>
 #include <net/ipv6.h>
@@ -74,20 +76,20 @@ static void bond_na_send(struct net_device *slave_dev,
         addrconf_addr_solict_mult(daddr, &mcaddr);
 
         pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
-               slave_dev->name, &mcaddr, daddr);
+                 slave_dev->name, &mcaddr, daddr);
 
         skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
                               ND_OPT_TARGET_LL_ADDR);
 
         if (!skb) {
-                pr_err(DRV_NAME ": NA packet allocation failed\n");
+                pr_err("NA packet allocation failed\n");
                 return;
         }
 
         if (vlan_id) {
                 skb = vlan_put_tag(skb, vlan_id);
                 if (!skb) {
-                        pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                        pr_err("failed to insert VLAN tag\n");
                         return;
                 }
         }
@@ -109,8 +111,8 @@ void bond_send_unsolicited_na(struct bonding *bond)
         struct inet6_dev *idev;
         int is_router;
 
-        pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
-                                slave ? slave->dev->name : "NULL");
+        pr_debug("%s: bond %s slave %s\n", bond->dev->name,
+                 __func__, slave ? slave->dev->name : "NULL");
 
         if (!slave || !bond->send_unsol_na ||
             test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index af9b9c4eb496..3f0071cfe56b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -31,6 +31,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -260,7 +262,7 @@ static int bond_add_vlan(struct bonding *bond, unsigned short vlan_id)
         struct vlan_entry *vlan;
 
         pr_debug("bond: %s, vlan id %d\n",
-                (bond ? bond->dev->name : "None"), vlan_id);
+                 (bond ? bond->dev->name : "None"), vlan_id);
 
         vlan = kzalloc(sizeof(struct vlan_entry), GFP_KERNEL);
         if (!vlan)
@@ -303,8 +305,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                         if (bond_is_lb(bond))
                                 bond_alb_clear_vlan(bond, vlan_id);
 
-                        pr_debug("removed VLAN ID %d from bond %s\n", vlan_id,
-                                bond->dev->name);
+                        pr_debug("removed VLAN ID %d from bond %s\n",
+                                 vlan_id, bond->dev->name);
 
                         kfree(vlan);
 
@@ -323,8 +325,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                 }
         }
 
-        pr_debug("couldn't find VLAN ID %d in bond %s\n", vlan_id,
-                bond->dev->name);
+        pr_debug("couldn't find VLAN ID %d in bond %s\n",
+                 vlan_id, bond->dev->name);
 
 out:
         write_unlock_bh(&bond->lock);
@@ -348,7 +350,7 @@ static int bond_has_challenged_slaves(struct bonding *bond)
         bond_for_each_slave(bond, slave, i) {
                 if (slave->dev->features & NETIF_F_VLAN_CHALLENGED) {
                         pr_debug("found VLAN challenged slave - %s\n",
-                                slave->dev->name);
+                                 slave->dev->name);
                         return 1;
                 }
         }
@@ -499,8 +501,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
 
         res = bond_add_vlan(bond, vid);
         if (res) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to add vlan id %d\n",
+                pr_err("%s: Error: Failed to add vlan id %d\n",
                        bond_dev->name, vid);
         }
 }
@@ -534,8 +535,7 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
 
         res = bond_del_vlan(bond, vid);
         if (res) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to remove vlan id %d\n",
+                pr_err("%s: Error: Failed to remove vlan id %d\n",
                        bond_dev->name, vid);
         }
 }
@@ -1053,8 +1053,7 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                 rv = dev_set_mac_address(new_active->dev, &saddr);
                 if (rv) {
-                        pr_err(DRV_NAME
-                               ": %s: Error %d setting MAC of slave %s\n",
+                        pr_err("%s: Error %d setting MAC of slave %s\n",
                                bond->dev->name, -rv, new_active->dev->name);
                         goto out;
                 }
@@ -1067,16 +1066,14 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                 rv = dev_set_mac_address(old_active->dev, &saddr);
                 if (rv)
-                        pr_err(DRV_NAME
-                               ": %s: Error %d setting MAC of slave %s\n",
+                        pr_err("%s: Error %d setting MAC of slave %s\n",
                                bond->dev->name, -rv, new_active->dev->name);
 out:
                 read_lock(&bond->lock);
                 write_lock_bh(&bond->curr_slave_lock);
                 break;
         default:
-                pr_err(DRV_NAME
-                       ": %s: bond_do_fail_over_mac impossible: bad policy %d\n",
+                pr_err("%s: bond_do_fail_over_mac impossible: bad policy %d\n",
                        bond->dev->name, bond->params.fail_over_mac);
                 break;
         }
@@ -1178,11 +1175,9 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 
                 if (new_active->link == BOND_LINK_BACK) {
                         if (USES_PRIMARY(bond->params.mode)) {
-                                pr_info(DRV_NAME
-                                       ": %s: making interface %s the new "
-                                       "active one %d ms earlier.\n",
-                                       bond->dev->name, new_active->dev->name,
-                                       (bond->params.updelay - new_active->delay) * bond->params.miimon);
+                                pr_info("%s: making interface %s the new active one %d ms earlier.\n",
+                                        bond->dev->name, new_active->dev->name,
+                                        (bond->params.updelay - new_active->delay) * bond->params.miimon);
                         }
 
                         new_active->delay = 0;
@@ -1195,10 +1190,8 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
                                 bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
                 } else {
                         if (USES_PRIMARY(bond->params.mode)) {
-                                pr_info(DRV_NAME
-                                       ": %s: making interface %s the new "
-                                       "active one.\n",
-                                       bond->dev->name, new_active->dev->name);
+                                pr_info("%s: making interface %s the new active one.\n",
+                                        bond->dev->name, new_active->dev->name);
                         }
                 }
         }
@@ -1268,13 +1261,11 @@ void bond_select_active_slave(struct bonding *bond)
                         return;
 
                 if (netif_carrier_ok(bond->dev)) {
-                        pr_info(DRV_NAME
-                               ": %s: first active interface up!\n",
-                               bond->dev->name);
+                        pr_info("%s: first active interface up!\n",
+                                bond->dev->name);
                 } else {
-                        pr_info(DRV_NAME ": %s: "
-                               "now running without any active interface !\n",
-                               bond->dev->name);
+                        pr_info("%s: now running without any active interface !\n",
+                                bond->dev->name);
                 }
         }
 }
@@ -1423,16 +1414,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 
         if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL &&
                 slave_ops->ndo_do_ioctl == NULL) {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: no link monitoring support for %s\n",
-                       bond_dev->name, slave_dev->name);
+                pr_warning("%s: Warning: no link monitoring support for %s\n",
+                           bond_dev->name, slave_dev->name);
         }
 
         /* bond must be initialized by bond_open() before enslaving */
         if (!(bond_dev->flags & IFF_UP)) {
-                pr_warning(DRV_NAME
-                        " %s: master_dev is not up in bond_enslave\n",
-                        bond_dev->name);
+                pr_warning("%s: master_dev is not up in bond_enslave\n",
+                           bond_dev->name);
         }
 
         /* already enslaved */
@@ -1446,19 +1435,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) {
                 pr_debug("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
                 if (!list_empty(&bond->vlan_list)) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: cannot enslave VLAN "
-                               "challenged slave %s on VLAN enabled "
-                               "bond %s\n", bond_dev->name, slave_dev->name,
-                               bond_dev->name);
+                        pr_err("%s: Error: cannot enslave VLAN challenged slave %s on VLAN enabled bond %s\n",
+                               bond_dev->name, slave_dev->name, bond_dev->name);
                         return -EPERM;
                 } else {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: enslaved VLAN challenged "
-                               "slave %s. Adding VLANs will be blocked as "
-                               "long as %s is part of bond %s\n",
-                               bond_dev->name, slave_dev->name, slave_dev->name,
-                               bond_dev->name);
+                        pr_warning("%s: Warning: enslaved VLAN challenged slave %s. Adding VLANs will be blocked as long as %s is part of bond %s\n",
+                                   bond_dev->name, slave_dev->name,
+                                   slave_dev->name, bond_dev->name);
                         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                 }
         } else {
@@ -1478,8 +1461,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
          * enslaving it; the old ifenslave will not.
          */
         if ((slave_dev->flags & IFF_UP)) {
-                pr_err(DRV_NAME ": %s is up. "
-                       "This may be due to an out of date ifenslave.\n",
+                pr_err("%s is up. This may be due to an out of date ifenslave.\n",
                        slave_dev->name);
                 res = -EPERM;
                 goto err_undo_flags;
@@ -1495,7 +1477,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (bond->slave_cnt == 0) {
                 if (bond_dev->type != slave_dev->type) {
                         pr_debug("%s: change device type from %d to %d\n",
-                                bond_dev->name, bond_dev->type, slave_dev->type);
+                                 bond_dev->name,
+                                 bond_dev->type, slave_dev->type);
 
                         netdev_bonding_change(bond_dev, NETDEV_BONDING_OLDTYPE);
 
@@ -1507,28 +1490,21 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                         netdev_bonding_change(bond_dev, NETDEV_BONDING_NEWTYPE);
                 }
         } else if (bond_dev->type != slave_dev->type) {
-                pr_err(DRV_NAME ": %s ether type (%d) is different "
-                        "from other slaves (%d), can not enslave it.\n",
-                        slave_dev->name,
-                        slave_dev->type, bond_dev->type);
-                        res = -EINVAL;
-                        goto err_undo_flags;
+                pr_err("%s ether type (%d) is different from other slaves (%d), can not enslave it.\n",
+                       slave_dev->name,
+                       slave_dev->type, bond_dev->type);
+                res = -EINVAL;
+                goto err_undo_flags;
         }
 
         if (slave_ops->ndo_set_mac_address == NULL) {
                 if (bond->slave_cnt == 0) {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: The first slave device "
-                               "specified does not support setting the MAC "
-                               "address. Setting fail_over_mac to active.",
-                               bond_dev->name);
+                        pr_warning("%s: Warning: The first slave device specified does not support setting the MAC address. Setting fail_over_mac to active.",
+                                   bond_dev->name);
                         bond->params.fail_over_mac = BOND_FOM_ACTIVE;
                 } else if (bond->params.fail_over_mac != BOND_FOM_ACTIVE) {
-                        pr_err(DRV_NAME
-                                ": %s: Error: The slave device specified "
-                                "does not support setting the MAC address, "
-                                "but fail_over_mac is not set to active.\n"
-                                , bond_dev->name);
+                        pr_err("%s: Error: The slave device specified does not support setting the MAC address, but fail_over_mac is not set to active.\n",
+                               bond_dev->name);
                         res = -EOPNOTSUPP;
                         goto err_undo_flags;
                 }
@@ -1655,22 +1631,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                          * supported); thus, we don't need to change
                          * the messages for netif_carrier.
                          */
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: MII and ETHTOOL support not "
-                               "available for interface %s, and "
-                               "arp_interval/arp_ip_target module parameters "
-                               "not specified, thus bonding will not detect "
-                               "link failures! see bonding.txt for details.\n",
+                        pr_warning("%s: Warning: MII and ETHTOOL support not available for interface %s, and arp_interval/arp_ip_target module parameters not specified, thus bonding will not detect link failures! see bonding.txt for details.\n",
                                bond_dev->name, slave_dev->name);
                 } else if (link_reporting == -1) {
                         /* unable get link status using mii/ethtool */
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: can't get link status from "
-                               "interface %s; the network driver associated "
-                               "with this interface does not support MII or "
-                               "ETHTOOL link status reporting, thus miimon "
-                               "has no effect on this interface.\n",
-                               bond_dev->name, slave_dev->name);
+                        pr_warning("%s: Warning: can't get link status from interface %s; the network driver associated with this interface does not support MII or ETHTOOL link status reporting, thus miimon has no effect on this interface.\n",
+                                   bond_dev->name, slave_dev->name);
                 }
         }
 
@@ -1678,34 +1644,27 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (!bond->params.miimon ||
             (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) {
                 if (bond->params.updelay) {
-                        pr_debug("Initial state of slave_dev is "
-                                "BOND_LINK_BACK\n");
+                        pr_debug("Initial state of slave_dev is BOND_LINK_BACK\n");
                         new_slave->link  = BOND_LINK_BACK;
                         new_slave->delay = bond->params.updelay;
                 } else {
-                        pr_debug("Initial state of slave_dev is "
-                                "BOND_LINK_UP\n");
+                        pr_debug("Initial state of slave_dev is BOND_LINK_UP\n");
                         new_slave->link  = BOND_LINK_UP;
                 }
                 new_slave->jiffies = jiffies;
         } else {
-                pr_debug("Initial state of slave_dev is "
-                        "BOND_LINK_DOWN\n");
+                pr_debug("Initial state of slave_dev is BOND_LINK_DOWN\n");
                 new_slave->link  = BOND_LINK_DOWN;
         }
 
         if (bond_update_speed_duplex(new_slave) &&
             (new_slave->link != BOND_LINK_DOWN)) {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: failed to get speed and duplex from %s, "
-                       "assumed to be 100Mb/sec and Full.\n",
-                       bond_dev->name, new_slave->dev->name);
+                pr_warning("%s: Warning: failed to get speed and duplex from %s, assumed to be 100Mb/sec and Full.\n",
+                           bond_dev->name, new_slave->dev->name);
 
                 if (bond->params.mode == BOND_MODE_8023AD) {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: Operation of 802.3ad mode requires ETHTOOL "
-                               "support in base driver for proper aggregator "
-                               "selection.\n", bond_dev->name);
+                        pr_warning("%s: Warning: Operation of 802.3ad mode requires ETHTOOL support in base driver for proper aggregator selection.\n",
+                                   bond_dev->name);
                 }
         }
 
@@ -1777,11 +1736,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (res)
                 goto err_close;
 
-        pr_info(DRV_NAME
-               ": %s: enslaving %s as a%s interface with a%s link.\n",
-               bond_dev->name, slave_dev->name,
-               new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
-               new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
+        pr_info("%s: enslaving %s as a%s interface with a%s link.\n",
+                bond_dev->name, slave_dev->name,
+                new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
+                new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
 
         /* enslave is successful */
         return 0;
@@ -1833,8 +1791,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         /* slave is not a slave or master is not master of this slave */
         if (!(slave_dev->flags & IFF_SLAVE) ||
             (slave_dev->master != bond_dev)) {
-                pr_err(DRV_NAME
-                       ": %s: Error: cannot release %s.\n",
+                pr_err("%s: Error: cannot release %s.\n",
                        bond_dev->name, slave_dev->name);
                 return -EINVAL;
         }
@@ -1844,9 +1801,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         slave = bond_get_slave_by_dev(bond, slave_dev);
         if (!slave) {
                 /* not a slave of this bond */
-                pr_info(DRV_NAME
-                       ": %s: %s not enslaved\n",
-                       bond_dev->name, slave_dev->name);
+                pr_info("%s: %s not enslaved\n",
+                        bond_dev->name, slave_dev->name);
                 write_unlock_bh(&bond->lock);
                 return -EINVAL;
         }
@@ -1854,14 +1810,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         if (!bond->params.fail_over_mac) {
                 if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) &&
                     bond->slave_cnt > 1)
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: the permanent HWaddr of %s - "
-                               "%pM - is still in use by %s. "
-                               "Set the HWaddr of %s to a different address "
-                               "to avoid conflicts.\n",
-                               bond_dev->name, slave_dev->name,
-                               slave->perm_hwaddr,
-                               bond_dev->name, slave_dev->name);
+                        pr_warning("%s: Warning: the permanent HWaddr of %s - %pM - is still in use by %s. Set the HWaddr of %s to a different address to avoid conflicts.\n",
+                                   bond_dev->name, slave_dev->name,
+                                   slave->perm_hwaddr,
+                                   bond_dev->name, slave_dev->name);
         }
 
         /* Inform AD package of unbinding of slave. */
@@ -1872,12 +1824,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 bond_3ad_unbind_slave(slave);
         }
 
-        pr_info(DRV_NAME
-               ": %s: releasing %s interface %s\n",
-               bond_dev->name,
-               (slave->state == BOND_STATE_ACTIVE)
-               ? "active" : "backup",
-               slave_dev->name);
+        pr_info("%s: releasing %s interface %s\n",
+                bond_dev->name,
+                (slave->state == BOND_STATE_ACTIVE) ? "active" : "backup",
+                slave_dev->name);
 
         oldcurrent = bond->curr_active_slave;
 
@@ -1934,21 +1884,15 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 if (list_empty(&bond->vlan_list)) {
                         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                 } else {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: clearing HW address of %s while it "
-                               "still has VLANs.\n",
-                               bond_dev->name, bond_dev->name);
-                        pr_warning(DRV_NAME
-                               ": %s: When re-adding slaves, make sure the bond's "
-                               "HW address matches its VLANs'.\n",
-                               bond_dev->name);
+                        pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                                   bond_dev->name, bond_dev->name);
+                        pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                                   bond_dev->name);
                 }
         } else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
                    !bond_has_challenged_slaves(bond)) {
-                pr_info(DRV_NAME
-                       ": %s: last VLAN challenged slave %s "
-                       "left bond %s. VLAN blocking is removed\n",
-                       bond_dev->name, slave_dev->name, bond_dev->name);
+                pr_info("%s: last VLAN challenged slave %s left bond %s. VLAN blocking is removed\n",
+                        bond_dev->name, slave_dev->name, bond_dev->name);
                 bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
         }
 
@@ -2011,8 +1955,8 @@ int  bond_release_and_destroy(struct net_device *bond_dev,
 
         ret = bond_release(bond_dev, slave_dev);
         if ((ret == 0) && (bond->slave_cnt == 0)) {
-                pr_info(DRV_NAME ": %s: destroying bond %s.\n",
-                       bond_dev->name, bond_dev->name);
+                pr_info("%s: destroying bond %s.\n",
+                        bond_dev->name, bond_dev->name);
                 unregister_netdevice(bond_dev);
         }
         return ret;
@@ -2116,19 +2060,13 @@ static int bond_release_all(struct net_device *bond_dev)
         if (list_empty(&bond->vlan_list))
                 bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
         else {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: clearing HW address of %s while it "
-                       "still has VLANs.\n",
-                       bond_dev->name, bond_dev->name);
-                pr_warning(DRV_NAME
-                       ": %s: When re-adding slaves, make sure the bond's "
-                       "HW address matches its VLANs'.\n",
-                       bond_dev->name);
+                pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                           bond_dev->name, bond_dev->name);
+                pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                           bond_dev->name);
         }
 
-        pr_info(DRV_NAME
-               ": %s: released all slaves\n",
-               bond_dev->name);
+        pr_info("%s: released all slaves\n", bond_dev->name);
 
 out:
         write_unlock_bh(&bond->lock);
@@ -2254,16 +2192,14 @@ static int bond_miimon_inspect(struct bonding *bond)
                         slave->link = BOND_LINK_FAIL;
                         slave->delay = bond->params.downdelay;
                         if (slave->delay) {
-                                pr_info(DRV_NAME
-                                       ": %s: link status down for %s"
-                                       "interface %s, disabling it in %d ms.\n",
-                                       bond->dev->name,
-                                       (bond->params.mode ==
-                                        BOND_MODE_ACTIVEBACKUP) ?
-                                       ((slave->state == BOND_STATE_ACTIVE) ?
-                                        "active " : "backup ") : "",
-                                       slave->dev->name,
-                                       bond->params.downdelay * bond->params.miimon);
+                                pr_info("%s: link status down for %sinterface %s, disabling it in %d ms.\n",
+                                        bond->dev->name,
+                                        (bond->params.mode ==
+                                         BOND_MODE_ACTIVEBACKUP) ?
+                                        ((slave->state == BOND_STATE_ACTIVE) ?
+                                         "active " : "backup ") : "",
+                                        slave->dev->name,
+                                        bond->params.downdelay * bond->params.miimon);
                         }
                         /*FALLTHRU*/
                 case BOND_LINK_FAIL:
@@ -2273,13 +2209,11 @@ static int bond_miimon_inspect(struct bonding *bond)
                                  */
                                 slave->link = BOND_LINK_UP;
                                 slave->jiffies = jiffies;
-                                pr_info(DRV_NAME
-                                       ": %s: link status up again after %d "
-                                       "ms for interface %s.\n",
-                                       bond->dev->name,
-                                       (bond->params.downdelay - slave->delay) *
-                                       bond->params.miimon,
-                                       slave->dev->name);
+                                pr_info("%s: link status up again after %d ms for interface %s.\n",
+                                        bond->dev->name,
+                                        (bond->params.downdelay - slave->delay) *
+                                        bond->params.miimon,
+                                        slave->dev->name);
                                 continue;
                         }
 
@@ -2300,25 +2234,21 @@ static int bond_miimon_inspect(struct bonding *bond)
                         slave->delay = bond->params.updelay;
 
                         if (slave->delay) {
-                                pr_info(DRV_NAME
-                                       ": %s: link status up for "
-                                       "interface %s, enabling it in %d ms.\n",
-                                       bond->dev->name, slave->dev->name,
-                                       ignore_updelay ? 0 :
-                                       bond->params.updelay *
-                                       bond->params.miimon);
+                                pr_info("%s: link status up for interface %s, enabling it in %d ms.\n",
+                                        bond->dev->name, slave->dev->name,
+                                        ignore_updelay ? 0 :
+                                        bond->params.updelay *
+                                        bond->params.miimon);
                         }
                         /*FALLTHRU*/
                 case BOND_LINK_BACK:
                         if (!link_state) {
                                 slave->link = BOND_LINK_DOWN;
-                                pr_info(DRV_NAME
-                                       ": %s: link status down again after %d "
-                                       "ms for interface %s.\n",
-                                       bond->dev->name,
-                                       (bond->params.updelay - slave->delay) *
-                                       bond->params.miimon,
-                                       slave->dev->name);
+                                pr_info("%s: link status down again after %d ms for interface %s.\n",
+                                        bond->dev->name,
+                                        (bond->params.updelay - slave->delay) *
+                                        bond->params.miimon,
+                                        slave->dev->name);
 
                                 continue;
                         }
@@ -2366,10 +2296,8 @@ static void bond_miimon_commit(struct bonding *bond)
                                 slave->state = BOND_STATE_BACKUP;
                         }
 
-                        pr_info(DRV_NAME
-                               ": %s: link status definitely "
-                               "up for interface %s.\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: link status definitely up for interface %s.\n",
+                                bond->dev->name, slave->dev->name);
 
                         /* notify ad that the link status has changed */
                         if (bond->params.mode == BOND_MODE_8023AD)
@@ -2395,10 +2323,8 @@ static void bond_miimon_commit(struct bonding *bond)
                             bond->params.mode == BOND_MODE_8023AD)
                                 bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                               ": %s: link status definitely down for "
-                               "interface %s, disabling it\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: link status definitely down for interface %s, disabling it\n",
+                                bond->dev->name, slave->dev->name);
 
                         if (bond->params.mode == BOND_MODE_8023AD)
                                 bond_3ad_handle_link_change(slave,
@@ -2414,8 +2340,7 @@ static void bond_miimon_commit(struct bonding *bond)
                         continue;
 
                 default:
-                        pr_err(DRV_NAME
-                               ": %s: invalid new link %d on slave %s\n",
+                        pr_err("%s: invalid new link %d on slave %s\n",
                                bond->dev->name, slave->new_link,
                                slave->dev->name);
                         slave->new_link = BOND_LINK_NOCHANGE;
@@ -2534,19 +2459,19 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
         struct sk_buff *skb;
 
         pr_debug("arp %d on slave %s: dst %x src %x vid %d\n", arp_op,
-               slave_dev->name, dest_ip, src_ip, vlan_id);
+                 slave_dev->name, dest_ip, src_ip, vlan_id);
 
         skb = arp_create(arp_op, ETH_P_ARP, dest_ip, slave_dev, src_ip,
                          NULL, slave_dev->dev_addr, NULL);
 
         if (!skb) {
-                pr_err(DRV_NAME ": ARP packet allocation failed\n");
+                pr_err("ARP packet allocation failed\n");
                 return;
         }
         if (vlan_id) {
                 skb = vlan_put_tag(skb, vlan_id);
                 if (!skb) {
-                        pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                        pr_err("failed to insert VLAN tag\n");
                         return;
                 }
         }
@@ -2586,9 +2511,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 rv = ip_route_output_key(dev_net(bond->dev), &rt, &fl);
                 if (rv) {
                         if (net_ratelimit()) {
-                                pr_warning(DRV_NAME
-                             ": %s: no route to arp_ip_target %pI4\n",
-                                       bond->dev->name, &fl.fl4_dst);
+                                pr_warning("%s: no route to arp_ip_target %pI4\n",
+                                           bond->dev->name, &fl.fl4_dst);
                         }
                         continue;
                 }
@@ -2623,10 +2547,9 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 }
 
                 if (net_ratelimit()) {
-                        pr_warning(DRV_NAME
-               ": %s: no path to arp_ip_target %pI4 via rt.dev %s\n",
-                               bond->dev->name, &fl.fl4_dst,
-                               rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
+                        pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
+                                   bond->dev->name, &fl.fl4_dst,
+                                   rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
         }
@@ -2644,8 +2567,8 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
         struct vlan_entry *vlan;
         struct net_device *vlan_dev;
 
-        pr_debug("bond_send_grat_arp: bond %s slave %s\n", bond->dev->name,
-                                slave ? slave->dev->name : "NULL");
+        pr_debug("bond_send_grat_arp: bond %s slave %s\n",
+                 bond->dev->name, slave ? slave->dev->name : "NULL");
 
         if (!slave || !bond->send_grat_arp ||
             test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
@@ -2674,7 +2597,8 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
 
         for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
                 pr_debug("bva: sip %pI4 tip %pI4 t[%d] %pI4 bhti(tip) %d\n",
-                        &sip, &tip, i, &targets[i], bond_has_this_ip(bond, tip));
+                         &sip, &tip, i, &targets[i],
+                         bond_has_this_ip(bond, tip));
                 if (sip == targets[i]) {
                         if (bond_has_this_ip(bond, tip))
                                 slave->last_arp_rx = jiffies;
@@ -2698,8 +2622,8 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         read_lock(&bond->lock);
 
         pr_debug("bond_arp_rcv: bond %s skb->dev %s orig_dev %s\n",
-                bond->dev->name, skb->dev ? skb->dev->name : "NULL",
-                orig_dev ? orig_dev->name : "NULL");
+                 bond->dev->name, skb->dev ? skb->dev->name : "NULL",
+                 orig_dev ? orig_dev->name : "NULL");
 
         slave = bond_get_slave_by_dev(bond, orig_dev);
         if (!slave || !slave_do_arp_validate(bond, slave))
@@ -2724,9 +2648,9 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         memcpy(&tip, arp_ptr, 4);
 
         pr_debug("bond_arp_rcv: %s %s/%d av %d sv %d sip %pI4 tip %pI4\n",
-                bond->dev->name, slave->dev->name, slave->state,
-                bond->params.arp_validate, slave_do_arp_validate(bond, slave),
-                &sip, &tip);
+                 bond->dev->name, slave->dev->name, slave->state,
+                 bond->params.arp_validate, slave_do_arp_validate(bond, slave),
+                 &sip, &tip);
 
         /*
          * Backup slaves won't see the ARP reply, but do come through
@@ -2800,17 +2724,14 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                  * is closed.
                                  */
                                 if (!oldcurrent) {
-                                        pr_info(DRV_NAME
-                                               ": %s: link status definitely "
-                                               "up for interface %s, ",
-                                               bond->dev->name,
-                                               slave->dev->name);
+                                        pr_info("%s: link status definitely up for interface %s, ",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                         do_failover = 1;
                                 } else {
-                                        pr_info(DRV_NAME
-                                               ": %s: interface %s is now up\n",
-                                               bond->dev->name,
-                                               slave->dev->name);
+                                        pr_info("%s: interface %s is now up\n",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                 }
                         }
                 } else {
@@ -2829,10 +2750,9 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                 if (slave->link_failure_count < UINT_MAX)
                                         slave->link_failure_count++;
 
-                                pr_info(DRV_NAME
-                                       ": %s: interface %s is now down.\n",
-                                       bond->dev->name,
-                                       slave->dev->name);
+                                pr_info("%s: interface %s is now down.\n",
+                                        bond->dev->name,
+                                        slave->dev->name);
 
                                 if (slave == oldcurrent)
                                         do_failover = 1;
@@ -2965,9 +2885,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                                 slave->link = BOND_LINK_UP;
                                 bond->current_arp_slave = NULL;
 
-                                pr_info(DRV_NAME
-                                        ": %s: link status definitely "
-                                        "up for interface %s.\n",
+                                pr_info("%s: link status definitely up for interface %s.\n",
                                         bond->dev->name, slave->dev->name);
 
                                 if (!bond->curr_active_slave ||
@@ -2985,9 +2903,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                         slave->link = BOND_LINK_DOWN;
                         bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                                ": %s: link status definitely down for "
-                                "interface %s, disabling it\n",
+                        pr_info("%s: link status definitely down for interface %s, disabling it\n",
                                 bond->dev->name, slave->dev->name);
 
                         if (slave == bond->curr_active_slave) {
@@ -2998,8 +2914,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                         continue;
 
                 default:
-                        pr_err(DRV_NAME
-                               ": %s: impossible: new_link %d on slave %s\n",
+                        pr_err("%s: impossible: new_link %d on slave %s\n",
                                bond->dev->name, slave->new_link,
                                slave->dev->name);
                         continue;
@@ -3028,9 +2943,9 @@ static void bond_ab_arp_probe(struct bonding *bond)
         read_lock(&bond->curr_slave_lock);
 
         if (bond->current_arp_slave && bond->curr_active_slave)
-                pr_info(DRV_NAME "PROBE: c_arp %s && cas %s BAD\n",
-                       bond->current_arp_slave->dev->name,
-                       bond->curr_active_slave->dev->name);
+                pr_info("PROBE: c_arp %s && cas %s BAD\n",
+                        bond->current_arp_slave->dev->name,
+                        bond->curr_active_slave->dev->name);
 
         if (bond->curr_active_slave) {
                 bond_arp_send_all(bond, bond->curr_active_slave);
@@ -3078,9 +2993,8 @@ static void bond_ab_arp_probe(struct bonding *bond)
 
                         bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                               ": %s: backup interface %s is now down.\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: backup interface %s is now down.\n",
+                                bond->dev->name, slave->dev->name);
                 }
         }
 }
@@ -3360,9 +3274,8 @@ static void bond_create_proc_entry(struct bonding *bond)
                                                     S_IRUGO, bn->proc_dir,
                                                     &bond_info_fops, bond);
                 if (bond->proc_entry == NULL)
-                        pr_warning(DRV_NAME
-                               ": Warning: Cannot create /proc/net/%s/%s\n",
-                               DRV_NAME, bond_dev->name);
+                        pr_warning("Warning: Cannot create /proc/net/%s/%s\n",
+                                   DRV_NAME, bond_dev->name);
                 else
                         memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
         }
@@ -3388,9 +3301,8 @@ static void bond_create_proc_dir(struct bond_net *bn)
         if (!bn->proc_dir) {
                 bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
                 if (!bn->proc_dir)
-                        pr_warning(DRV_NAME
-                                ": Warning: cannot create /proc/net/%s\n",
-                                DRV_NAME);
+                        pr_warning("Warning: cannot create /proc/net/%s\n",
+                                   DRV_NAME);
         }
 }
 
@@ -3539,8 +3451,8 @@ static int bond_netdev_event(struct notifier_block *this,
         struct net_device *event_dev = (struct net_device *)ptr;
 
         pr_debug("event_dev: %s, event: %lx\n",
-                (event_dev ? event_dev->name : "None"),
-                event);
+                 event_dev ? event_dev->name : "None",
+                 event);
 
         if (!(event_dev->priv_flags & IFF_BONDING))
                 return NOTIFY_DONE;
@@ -3875,8 +3787,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
         struct mii_ioctl_data *mii = NULL;
         int res = 0;
 
-        pr_debug("bond_ioctl: master=%s, cmd=%d\n",
-                bond_dev->name, cmd);
+        pr_debug("bond_ioctl: master=%s, cmd=%d\n", bond_dev->name, cmd);
 
         switch (cmd) {
         case SIOCGMIIPHY:
@@ -3945,12 +3856,12 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 
         slave_dev = dev_get_by_name(dev_net(bond_dev), ifr->ifr_slave);
 
-        pr_debug("slave_dev=%p: \n", slave_dev);
+        pr_debug("slave_dev=%p:\n", slave_dev);
 
         if (!slave_dev)
                 res = -ENODEV;
         else {
-                pr_debug("slave_dev->name=%s: \n", slave_dev->name);
+                pr_debug("slave_dev->name=%s:\n", slave_dev->name);
                 switch (cmd) {
                 case BOND_ENSLAVE_OLD:
                 case SIOCBONDENSLAVE:
@@ -4059,7 +3970,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
         int i;
 
         pr_debug("bond=%p, name=%s, new_mtu=%d\n", bond,
-                (bond_dev ? bond_dev->name : "None"), new_mtu);
+                 (bond_dev ? bond_dev->name : "None"), new_mtu);
 
         /* Can't hold bond->lock with bh disabled here since
          * some base drivers panic. On the other hand we can't
@@ -4077,8 +3988,10 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
          */
 
         bond_for_each_slave(bond, slave, i) {
-                pr_debug("s %p s->p %p c_m %p\n", slave,
-                        slave->prev, slave->dev->netdev_ops->ndo_change_mtu);
+                pr_debug("s %p s->p %p c_m %p\n",
+                         slave,
+                         slave->prev,
+                         slave->dev->netdev_ops->ndo_change_mtu);
 
                 res = dev_set_mtu(slave->dev, new_mtu);
 
@@ -4108,8 +4021,8 @@ unwind:
 
                 tmp_res = dev_set_mtu(slave->dev, bond_dev->mtu);
                 if (tmp_res) {
-                        pr_debug("unwind err %d dev %s\n", tmp_res,
-                                slave->dev->name);
+                        pr_debug("unwind err %d dev %s\n",
+                                 tmp_res, slave->dev->name);
                 }
         }
 
@@ -4135,7 +4048,8 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
                 return bond_alb_set_mac_address(bond_dev, addr);
 
 
-        pr_debug("bond=%p, name=%s\n", bond, (bond_dev ? bond_dev->name : "None"));
+        pr_debug("bond=%p, name=%s\n",
+                 bond, bond_dev ? bond_dev->name : "None");
 
         /*
          * If fail_over_mac is set to active, do nothing and return
@@ -4200,8 +4114,8 @@ unwind:
 
                 tmp_res = dev_set_mac_address(slave->dev, &tmp_sa);
                 if (tmp_res) {
-                        pr_debug("unwind err %d dev %s\n", tmp_res,
-                                slave->dev->name);
+                        pr_debug("unwind err %d dev %s\n",
+                                 tmp_res, slave->dev->name);
                 }
         }
 
@@ -4357,9 +4271,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
                         if (tx_dev) {
                                 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
                                 if (!skb2) {
-                                        pr_err(DRV_NAME
-                                               ": %s: Error: bond_xmit_broadcast(): "
-                                               "skb_clone() failed\n",
+                                        pr_err("%s: Error: bond_xmit_broadcast(): skb_clone() failed\n",
                                                bond_dev->name);
                                         continue;
                                 }
@@ -4425,8 +4337,8 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 return bond_alb_xmit(skb, dev);
         default:
                 /* Should never happen, mode already checked */
-                pr_err(DRV_NAME ": %s: Error: Unknown bonding mode %d\n",
-                     dev->name, bond->params.mode);
+                pr_err("%s: Error: Unknown bonding mode %d\n",
+                       dev->name, bond->params.mode);
                 WARN_ON_ONCE(1);
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
@@ -4462,10 +4374,8 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
                 break;
         default:
                 /* Should never happen, mode already checked */
-                pr_err(DRV_NAME
-                       ": %s: Error: Unknown bonding mode %d\n",
-                       bond_dev->name,
-                       mode);
+                pr_err("%s: Error: Unknown bonding mode %d\n",
+                       bond_dev->name, mode);
                 break;
         }
 }
@@ -4650,8 +4560,7 @@ static int bond_check_params(struct bond_params *params)
         if (mode) {
                 bond_mode = bond_parse_parm(mode, bond_mode_tbl);
                 if (bond_mode == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid bonding mode \"%s\"\n",
+                        pr_err("Error: Invalid bonding mode \"%s\"\n",
                                mode == NULL ? "NULL" : mode);
                         return -EINVAL;
                 }
@@ -4660,16 +4569,13 @@ static int bond_check_params(struct bond_params *params)
         if (xmit_hash_policy) {
                 if ((bond_mode != BOND_MODE_XOR) &&
                     (bond_mode != BOND_MODE_8023AD)) {
-                        pr_info(DRV_NAME
-                                ": xmit_hash_policy param is irrelevant in"
-                                " mode %s\n",
+                        pr_info("xmit_hash_policy param is irrelevant in mode %s\n",
                                bond_mode_name(bond_mode));
                 } else {
                         xmit_hashtype = bond_parse_parm(xmit_hash_policy,
                                                         xmit_hashtype_tbl);
                         if (xmit_hashtype == -1) {
-                                pr_err(DRV_NAME
-                                       ": Error: Invalid xmit_hash_policy \"%s\"\n",
+                                pr_err("Error: Invalid xmit_hash_policy \"%s\"\n",
                                        xmit_hash_policy == NULL ? "NULL" :
                                        xmit_hash_policy);
                                 return -EINVAL;
@@ -4679,14 +4585,12 @@ static int bond_check_params(struct bond_params *params)
 
         if (lacp_rate) {
                 if (bond_mode != BOND_MODE_8023AD) {
-                        pr_info(DRV_NAME
-                               ": lacp_rate param is irrelevant in mode %s\n",
-                               bond_mode_name(bond_mode));
+                        pr_info("lacp_rate param is irrelevant in mode %s\n",
+                                bond_mode_name(bond_mode));
                 } else {
                         lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl);
                         if (lacp_fast == -1) {
-                                pr_err(DRV_NAME
-                                       ": Error: Invalid lacp rate \"%s\"\n",
+                                pr_err("Error: Invalid lacp rate \"%s\"\n",
                                        lacp_rate == NULL ? "NULL" : lacp_rate);
                                 return -EINVAL;
                         }
@@ -4696,82 +4600,64 @@ static int bond_check_params(struct bond_params *params)
         if (ad_select) {
                 params->ad_select = bond_parse_parm(ad_select, ad_select_tbl);
                 if (params->ad_select == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid ad_select \"%s\"\n",
+                        pr_err("Error: Invalid ad_select \"%s\"\n",
                                ad_select == NULL ? "NULL" : ad_select);
                         return -EINVAL;
                 }
 
                 if (bond_mode != BOND_MODE_8023AD) {
-                        pr_warning(DRV_NAME
-                               ": ad_select param only affects 802.3ad mode\n");
+                        pr_warning("ad_select param only affects 802.3ad mode\n");
                 }
         } else {
                 params->ad_select = BOND_AD_STABLE;
         }
 
         if (max_bonds < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: max_bonds (%d) not in range %d-%d, so it "
-                       "was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
-                       max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
+                pr_warning("Warning: max_bonds (%d) not in range %d-%d, so it was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
+                           max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
                 max_bonds = BOND_DEFAULT_MAX_BONDS;
         }
 
         if (miimon < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: miimon module parameter (%d), "
-                       "not in range 0-%d, so it was reset to %d\n",
-                       miimon, INT_MAX, BOND_LINK_MON_INTERV);
+                pr_warning("Warning: miimon module parameter (%d), not in range 0-%d, so it was reset to %d\n",
+                           miimon, INT_MAX, BOND_LINK_MON_INTERV);
                 miimon = BOND_LINK_MON_INTERV;
         }
 
         if (updelay < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: updelay module parameter (%d), "
-                       "not in range 0-%d, so it was reset to 0\n",
-                       updelay, INT_MAX);
+                pr_warning("Warning: updelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                           updelay, INT_MAX);
                 updelay = 0;
         }
 
         if (downdelay < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: downdelay module parameter (%d), "
-                       "not in range 0-%d, so it was reset to 0\n",
-                       downdelay, INT_MAX);
+                pr_warning("Warning: downdelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                           downdelay, INT_MAX);
                 downdelay = 0;
         }
 
         if ((use_carrier != 0) && (use_carrier != 1)) {
-                pr_warning(DRV_NAME
-                       ": Warning: use_carrier module parameter (%d), "
-                       "not of valid value (0/1), so it was set to 1\n",
-                       use_carrier);
+                pr_warning("Warning: use_carrier module parameter (%d), not of valid value (0/1), so it was set to 1\n",
+                           use_carrier);
                 use_carrier = 1;
         }
 
         if (num_grat_arp < 0 || num_grat_arp > 255) {
-                pr_warning(DRV_NAME
-                       ": Warning: num_grat_arp (%d) not in range 0-255 so it "
-                       "was reset to 1 \n", num_grat_arp);
+                pr_warning("Warning: num_grat_arp (%d) not in range 0-255 so it was reset to 1 \n",
+                           num_grat_arp);
                 num_grat_arp = 1;
         }
 
         if (num_unsol_na < 0 || num_unsol_na > 255) {
-                pr_warning(DRV_NAME
-                       ": Warning: num_unsol_na (%d) not in range 0-255 so it "
-                       "was reset to 1 \n", num_unsol_na);
+                pr_warning("Warning: num_unsol_na (%d) not in range 0-255 so it was reset to 1 \n",
+                           num_unsol_na);
                 num_unsol_na = 1;
         }
 
         /* reset values for 802.3ad */
         if (bond_mode == BOND_MODE_8023AD) {
                 if (!miimon) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon must be specified, "
-                               "otherwise bonding will not detect link "
-                               "failure, speed and duplex which are "
-                               "essential for 802.3ad operation\n");
+                        pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure, speed and duplex which are essential for 802.3ad operation\n");
                         pr_warning("Forcing miimon to 100msec\n");
                         miimon = 100;
                 }
@@ -4781,24 +4667,15 @@ static int bond_check_params(struct bond_params *params)
         if ((bond_mode == BOND_MODE_TLB) ||
             (bond_mode == BOND_MODE_ALB)) {
                 if (!miimon) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon must be specified, "
-                               "otherwise bonding will not detect link "
-                               "failure and link speed which are essential "
-                               "for TLB/ALB load balancing\n");
+                        pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure and link speed which are essential for TLB/ALB load balancing\n");
                         pr_warning("Forcing miimon to 100msec\n");
                         miimon = 100;
                 }
         }
 
         if (bond_mode == BOND_MODE_ALB) {
-                pr_notice(DRV_NAME
-                       ": In ALB mode you might experience client "
-                       "disconnections upon reconnection of a link if the "
-                       "bonding module updelay parameter (%d msec) is "
-                       "incompatible with the forwarding delay time of the "
-                       "switch\n",
-                       updelay);
+                pr_notice("In ALB mode you might experience client disconnections upon reconnection of a link if the bonding module updelay parameter (%d msec) is incompatible with the forwarding delay time of the switch\n",
+                          updelay);
         }
 
         if (!miimon) {
@@ -4806,49 +4683,37 @@ static int bond_check_params(struct bond_params *params)
                         /* just warn the user the up/down delay will have
                          * no effect since miimon is zero...
                          */
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon module parameter not set "
-                               "and updelay (%d) or downdelay (%d) module "
-                               "parameter is set; updelay and downdelay have "
-                               "no effect unless miimon is set\n",
-                               updelay, downdelay);
+                        pr_warning("Warning: miimon module parameter not set and updelay (%d) or downdelay (%d) module parameter is set; updelay and downdelay have no effect unless miimon is set\n",
+                                   updelay, downdelay);
                 }
         } else {
                 /* don't allow arp monitoring */
                 if (arp_interval) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon (%d) and arp_interval (%d) "
-                               "can't be used simultaneously, disabling ARP "
-                               "monitoring\n",
-                               miimon, arp_interval);
+                        pr_warning("Warning: miimon (%d) and arp_interval (%d) can't be used simultaneously, disabling ARP monitoring\n",
+                                   miimon, arp_interval);
                         arp_interval = 0;
                 }
 
                 if ((updelay % miimon) != 0) {
-                        pr_warning(DRV_NAME
-                               ": Warning: updelay (%d) is not a multiple "
-                               "of miimon (%d), updelay rounded to %d ms\n",
-                               updelay, miimon, (updelay / miimon) * miimon);
+                        pr_warning("Warning: updelay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
+                                   updelay, miimon,
+                                   (updelay / miimon) * miimon);
                 }
 
                 updelay /= miimon;
 
                 if ((downdelay % miimon) != 0) {
-                        pr_warning(DRV_NAME
-                               ": Warning: downdelay (%d) is not a multiple "
-                               "of miimon (%d), downdelay rounded to %d ms\n",
-                               downdelay, miimon,
-                               (downdelay / miimon) * miimon);
+                        pr_warning("Warning: downdelay (%d) is not a multiple of miimon (%d), downdelay rounded to %d ms\n",
+                                   downdelay, miimon,
+                                   (downdelay / miimon) * miimon);
                 }
 
                 downdelay /= miimon;
         }
 
         if (arp_interval < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: arp_interval module parameter (%d) "
-                       ", not in range 0-%d, so it was reset to %d\n",
-                       arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
+                pr_warning("Warning: arp_interval module parameter (%d) , not in range 0-%d, so it was reset to %d\n",
+                           arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
                 arp_interval = BOND_LINK_ARP_INTERV;
         }
 
@@ -4858,10 +4723,8 @@ static int bond_check_params(struct bond_params *params)
                 /* not complete check, but should be good enough to
                    catch mistakes */
                 if (!isdigit(arp_ip_target[arp_ip_count][0])) {
-                        pr_warning(DRV_NAME
-                               ": Warning: bad arp_ip_target module parameter "
-                               "(%s), ARP monitoring will not be performed\n",
-                               arp_ip_target[arp_ip_count]);
+                        pr_warning("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n",
+                                   arp_ip_target[arp_ip_count]);
                         arp_interval = 0;
                 } else {
                         __be32 ip = in_aton(arp_ip_target[arp_ip_count]);
@@ -4871,31 +4734,25 @@ static int bond_check_params(struct bond_params *params)
 
         if (arp_interval && !arp_ip_count) {
                 /* don't allow arping if no arp_ip_target given... */
-                pr_warning(DRV_NAME
-                       ": Warning: arp_interval module parameter (%d) "
-                       "specified without providing an arp_ip_target "
-                       "parameter, arp_interval was reset to 0\n",
-                       arp_interval);
+                pr_warning("Warning: arp_interval module parameter (%d) specified without providing an arp_ip_target parameter, arp_interval was reset to 0\n",
+                           arp_interval);
                 arp_interval = 0;
         }
 
         if (arp_validate) {
                 if (bond_mode != BOND_MODE_ACTIVEBACKUP) {
-                        pr_err(DRV_NAME
-                               ": arp_validate only supported in active-backup mode\n");
+                        pr_err("arp_validate only supported in active-backup mode\n");
                         return -EINVAL;
                 }
                 if (!arp_interval) {
-                        pr_err(DRV_NAME
-                               ": arp_validate requires arp_interval\n");
+                        pr_err("arp_validate requires arp_interval\n");
                         return -EINVAL;
                 }
 
                 arp_validate_value = bond_parse_parm(arp_validate,
                                                      arp_validate_tbl);
                 if (arp_validate_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: invalid arp_validate \"%s\"\n",
+                        pr_err("Error: invalid arp_validate \"%s\"\n",
                                arp_validate == NULL ? "NULL" : arp_validate);
                         return -EINVAL;
                 }
@@ -4903,17 +4760,14 @@ static int bond_check_params(struct bond_params *params)
                 arp_validate_value = 0;
 
         if (miimon) {
-                pr_info(DRV_NAME
-                       ": MII link monitoring set to %d ms\n",
-                       miimon);
+                pr_info("MII link monitoring set to %d ms\n", miimon);
         } else if (arp_interval) {
                 int i;
 
-                pr_info(DRV_NAME ": ARP monitoring set to %d ms,"
-                       " validate %s, with %d target(s):",
-                       arp_interval,
-                       arp_validate_tbl[arp_validate_value].modename,
-                       arp_ip_count);
+                pr_info("ARP monitoring set to %d ms, validate %s, with %d target(s):",
+                        arp_interval,
+                        arp_validate_tbl[arp_validate_value].modename,
+                        arp_ip_count);
 
                 for (i = 0; i < arp_ip_count; i++)
                         pr_info(" %s", arp_ip_target[i]);
@@ -4924,21 +4778,15 @@ static int bond_check_params(struct bond_params *params)
                 /* miimon and arp_interval not set, we need one so things
                  * work as expected, see bonding.txt for details
                  */
-                pr_warning(DRV_NAME
-                       ": Warning: either miimon or arp_interval and "
-                       "arp_ip_target module parameters must be specified, "
-                       "otherwise bonding will not detect link failures! see "
-                       "bonding.txt for details.\n");
+                pr_warning("Warning: either miimon or arp_interval and arp_ip_target module parameters must be specified, otherwise bonding will not detect link failures! see bonding.txt for details.\n");
         }
 
         if (primary && !USES_PRIMARY(bond_mode)) {
                 /* currently, using a primary only makes sense
                  * in active backup, TLB or ALB modes
                  */
-                pr_warning(DRV_NAME
-                       ": Warning: %s primary device specified but has no "
-                       "effect in %s mode\n",
-                       primary, bond_mode_name(bond_mode));
+                pr_warning("Warning: %s primary device specified but has no effect in %s mode\n",
+                           primary, bond_mode_name(bond_mode));
                 primary = NULL;
         }
 
@@ -4946,8 +4794,7 @@ static int bond_check_params(struct bond_params *params)
                 primary_reselect_value = bond_parse_parm(primary_reselect,
                                                          pri_reselect_tbl);
                 if (primary_reselect_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid primary_reselect \"%s\"\n",
+                        pr_err("Error: Invalid primary_reselect \"%s\"\n",
                                primary_reselect ==
                                         NULL ? "NULL" : primary_reselect);
                         return -EINVAL;
@@ -4960,16 +4807,13 @@ static int bond_check_params(struct bond_params *params)
                 fail_over_mac_value = bond_parse_parm(fail_over_mac,
                                                       fail_over_mac_tbl);
                 if (fail_over_mac_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: invalid fail_over_mac \"%s\"\n",
+                        pr_err("Error: invalid fail_over_mac \"%s\"\n",
                                arp_validate == NULL ? "NULL" : arp_validate);
                         return -EINVAL;
                 }
 
                 if (bond_mode != BOND_MODE_ACTIVEBACKUP)
-                        pr_warning(DRV_NAME
-                               ": Warning: fail_over_mac only affects "
-                               "active-backup mode.\n");
+                        pr_warning("Warning: fail_over_mac only affects active-backup mode.\n");
         } else {
                 fail_over_mac_value = BOND_FOM_NONE;
         }
@@ -5076,8 +4920,7 @@ int bond_create(struct net *net, const char *name)
         bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
                                 bond_setup);
         if (!bond_dev) {
-                pr_err(DRV_NAME ": %s: eek! can't alloc netdev!\n",
-                       name);
+                pr_err("%s: eek! can't alloc netdev!\n", name);
                 res = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 4e00b4f83641..5acd557cea9b 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -19,6 +19,9 @@
  * file called LICENSE.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -109,11 +112,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 goto err_no_cmd;
 
         if (command[0] == '+') {
-                pr_info(DRV_NAME
-                        ": %s is being created...\n", ifname);
+                pr_info("%s is being created...\n", ifname);
                 rv = bond_create(net, ifname);
                 if (rv) {
-                        pr_info(DRV_NAME ": Bond creation failed.\n");
+                        pr_info("Bond creation failed.\n");
                         res = rv;
                 }
         } else if (command[0] == '-') {
@@ -122,12 +124,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 rtnl_lock();
                 bond_dev = bond_get_by_name(net, ifname);
                 if (bond_dev) {
-                        pr_info(DRV_NAME ": %s is being deleted...\n",
-                                ifname);
+                        pr_info("%s is being deleted...\n", ifname);
                         unregister_netdevice(bond_dev);
                 } else {
-                        pr_err(DRV_NAME ": unable to delete non-existent %s\n",
-                               ifname);
+                        pr_err("unable to delete non-existent %s\n", ifname);
                         res = -ENODEV;
                 }
                 rtnl_unlock();
@@ -140,8 +140,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
         return res;
 
 err_no_cmd:
-        pr_err(DRV_NAME ": no command found in bonding_masters."
-               " Use +ifname or -ifname.\n");
+        pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n");
         return -EPERM;
 }
 
@@ -225,8 +224,8 @@ static ssize_t bonding_store_slaves(struct device *d,
 
         /* Quick sanity check -- is the bond interface up? */
         if (!(bond->dev->flags & IFF_UP)) {
-                pr_warning(DRV_NAME ": %s: doing slave updates when "
-                           "interface is down.\n", bond->dev->name);
+                pr_warning("%s: doing slave updates when interface is down.\n",
+                           bond->dev->name);
         }
 
         /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
@@ -247,17 +246,14 @@ static ssize_t bonding_store_slaves(struct device *d,
 
                 dev = __dev_get_by_name(dev_net(bond->dev), ifname);
                 if (!dev) {
-                        pr_info(DRV_NAME
-                               ": %s: Interface %s does not exist!\n",
-                               bond->dev->name, ifname);
+                        pr_info("%s: Interface %s does not exist!\n",
+                                bond->dev->name, ifname);
                         ret = -ENODEV;
                         goto out;
                 }
 
                 if (dev->flags & IFF_UP) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: Unable to enslave %s "
-                               "because it is already up.\n",
+                        pr_err("%s: Error: Unable to enslave %s because it is already up.\n",
                                bond->dev->name, dev->name);
                         ret = -EPERM;
                         goto out;
@@ -266,8 +262,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                 read_lock(&bond->lock);
                 bond_for_each_slave(bond, slave, i)
                         if (slave->dev == dev) {
-                                pr_err(DRV_NAME
-                                       ": %s: Interface %s is already enslaved!\n",
+                                pr_err("%s: Interface %s is already enslaved!\n",
                                        bond->dev->name, ifname);
                                 ret = -EPERM;
                                 read_unlock(&bond->lock);
@@ -275,8 +270,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                         }
                 read_unlock(&bond->lock);
 
-                pr_info(DRV_NAME ": %s: Adding slave %s.\n",
-                        bond->dev->name, ifname);
+                pr_info("%s: Adding slave %s.\n", bond->dev->name, ifname);
 
                 /* If this is the first slave, then we need to set
                    the master's hardware address to be the same as the
@@ -313,7 +307,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                                 break;
                         }
                 if (dev) {
-                        pr_info(DRV_NAME ": %s: Removing slave %s\n",
+                        pr_info("%s: Removing slave %s\n",
                                 bond->dev->name, dev->name);
                                 res = bond_release(bond->dev, dev);
                         if (res) {
@@ -323,16 +317,16 @@ static ssize_t bonding_store_slaves(struct device *d,
                         /* set the slave MTU to the default */
                         dev_set_mtu(dev, original_mtu);
                 } else {
-                        pr_err(DRV_NAME ": unable to remove non-existent"
-                               " slave %s for bond %s.\n",
-                                ifname, bond->dev->name);
+                        pr_err("unable to remove non-existent slave %s for bond %s.\n",
+                               ifname, bond->dev->name);
                         ret = -ENODEV;
                 }
                 goto out;
         }
 
 err_no_cmd:
-        pr_err(DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
+        pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
+               bond->dev->name);
         ret = -EPERM;
 
 out:
@@ -365,18 +359,16 @@ static ssize_t bonding_store_mode(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME ": unable to update mode of %s"
-                       " because interface is up.\n", bond->dev->name);
+                pr_err("unable to update mode of %s because interface is up.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         new_value = bond_parse_parm(buf, bond_mode_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid mode value %.*s.\n",
-                       bond->dev->name,
-                       (int)strlen(buf) - 1, buf);
+                pr_err("%s: Ignoring invalid mode value %.*s.\n",
+                       bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
                 goto out;
         } else {
@@ -388,8 +380,8 @@ static ssize_t bonding_store_mode(struct device *d,
 
                 bond->params.mode = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                pr_info(DRV_NAME ": %s: setting mode to %s (%d).\n",
-                       bond->dev->name, bond_mode_tbl[new_value].modename,
+                pr_info("%s: setting mode to %s (%d).\n",
+                        bond->dev->name, bond_mode_tbl[new_value].modename,
                        new_value);
         }
 out:
@@ -421,8 +413,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       "%s: Interface is up. Unable to update xmit policy.\n",
+                pr_err("%s: Interface is up. Unable to update xmit policy.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
@@ -430,8 +421,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 
         new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
+                pr_err("%s: Ignoring invalid xmit hash policy value %.*s.\n",
                        bond->dev->name,
                        (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
@@ -439,7 +429,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         } else {
                 bond->params.xmit_policy = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                pr_info(DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
+                pr_info("%s: setting xmit hash policy to %s (%d).\n",
                         bond->dev->name,
                         xmit_hashtype_tbl[new_value].modename, new_value);
         }
@@ -472,20 +462,18 @@ static ssize_t bonding_store_arp_validate(struct device *d,
 
         new_value = bond_parse_parm(buf, arp_validate_tbl);
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid arp_validate value %s\n",
+                pr_err("%s: Ignoring invalid arp_validate value %s\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
         if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
-                pr_err(DRV_NAME
-                       ": %s: arp_validate only supported in active-backup mode.\n",
+                pr_err("%s: arp_validate only supported in active-backup mode.\n",
                        bond->dev->name);
                 return -EINVAL;
         }
-        pr_info(DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
-               bond->dev->name, arp_validate_tbl[new_value].modename,
-               new_value);
+        pr_info("%s: setting arp_validate to %s (%d).\n",
+                bond->dev->name, arp_validate_tbl[new_value].modename,
+                new_value);
 
         if (!bond->params.arp_validate && new_value)
                 bond_register_arp(bond);
@@ -523,24 +511,22 @@ static ssize_t bonding_store_fail_over_mac(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->slave_cnt != 0) {
-                pr_err(DRV_NAME
-                       ": %s: Can't alter fail_over_mac with slaves in bond.\n",
+                pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",
                        bond->dev->name);
                 return -EPERM;
         }
 
         new_value = bond_parse_parm(buf, fail_over_mac_tbl);
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid fail_over_mac value %s.\n",
+                pr_err("%s: Ignoring invalid fail_over_mac value %s.\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
 
         bond->params.fail_over_mac = new_value;
-        pr_info(DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
-               bond->dev->name, fail_over_mac_tbl[new_value].modename,
-               new_value);
+        pr_info("%s: Setting fail_over_mac to %s (%d).\n",
+                bond->dev->name, fail_over_mac_tbl[new_value].modename,
+                new_value);
 
         return count;
 }
@@ -571,31 +557,26 @@ static ssize_t bonding_store_arp_interval(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no arp_interval value specified.\n",
+                pr_err("%s: no arp_interval value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
+                pr_err("%s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
                        bond->dev->name, new_value, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         }
 
-        pr_info(DRV_NAME
-               ": %s: Setting ARP monitoring interval to %d.\n",
-               bond->dev->name, new_value);
+        pr_info("%s: Setting ARP monitoring interval to %d.\n",
+                bond->dev->name, new_value);
         bond->params.arp_interval = new_value;
         if (bond->params.arp_interval)
                 bond->dev->priv_flags |= IFF_MASTER_ARPMON;
         if (bond->params.miimon) {
-                pr_info(DRV_NAME
-                       ": %s: ARP monitoring cannot be used with MII monitoring. "
-                       "%s Disabling MII monitoring.\n",
-                       bond->dev->name, bond->dev->name);
+                pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
+                        bond->dev->name, bond->dev->name);
                 bond->params.miimon = 0;
                 if (delayed_work_pending(&bond->mii_work)) {
                         cancel_delayed_work(&bond->mii_work);
@@ -603,10 +584,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                 }
         }
         if (!bond->params.arp_targets[0]) {
-                pr_info(DRV_NAME
-                       ": %s: ARP monitoring has been set up, "
-                       "but no ARP targets have been specified.\n",
-                       bond->dev->name);
+                pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n",
+                        bond->dev->name);
         }
         if (bond->dev->flags & IFF_UP) {
                 /* If the interface is up, we may need to fire off
@@ -666,8 +645,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
         /* look for adds */
         if (buf[0] == '+') {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        pr_err(DRV_NAME
-                               ": %s: invalid ARP target %pI4 specified for addition\n",
+                        pr_err("%s: invalid ARP target %pI4 specified for addition\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
@@ -675,23 +653,20 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 /* look for an empty slot to put the target in, and check for dupes */
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) { /* duplicate */
-                                pr_err(DRV_NAME
-                                       ": %s: ARP target %pI4 is already present\n",
+                                pr_err("%s: ARP target %pI4 is already present\n",
                                        bond->dev->name, &newtarget);
                                 ret = -EINVAL;
                                 goto out;
                         }
                         if (targets[i] == 0) {
-                                pr_info(DRV_NAME
-                                       ": %s: adding ARP target %pI4.\n",
-                                       bond->dev->name, &newtarget);
+                                pr_info("%s: adding ARP target %pI4.\n",
+                                        bond->dev->name, &newtarget);
                                 done = 1;
                                 targets[i] = newtarget;
                         }
                 }
                 if (!done) {
-                        pr_err(DRV_NAME
-                               ": %s: ARP target table is full!\n",
+                        pr_err("%s: ARP target table is full!\n",
                                bond->dev->name);
                         ret = -EINVAL;
                         goto out;
@@ -699,8 +674,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
 
         } else if (buf[0] == '-')       {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        pr_err(DRV_NAME
-                               ": %s: invalid ARP target %pI4 specified for removal\n",
+                        pr_err("%s: invalid ARP target %pI4 specified for removal\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
@@ -709,9 +683,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) {
                                 int j;
-                                pr_info(DRV_NAME
-                                       ": %s: removing ARP target %pI4.\n",
-                                       bond->dev->name, &newtarget);
+                                pr_info("%s: removing ARP target %pI4.\n",
+                                        bond->dev->name, &newtarget);
                                 for (j = i; (j < (BOND_MAX_ARP_TARGETS-1)) && targets[j+1]; j++)
                                         targets[j] = targets[j+1];
 
@@ -720,16 +693,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                         }
                 }
                 if (!done) {
-                        pr_info(DRV_NAME
-                               ": %s: unable to remove nonexistent ARP target %pI4.\n",
-                               bond->dev->name, &newtarget);
+                        pr_info("%s: unable to remove nonexistent ARP target %pI4.\n",
+                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
                 }
         } else {
-                pr_err(DRV_NAME ": no command found in arp_ip_targets file"
-                       " for bond %s. Use +<addr> or -<addr>.\n",
-                        bond->dev->name);
+                pr_err("no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
@@ -761,41 +732,34 @@ static ssize_t bonding_store_downdelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to set down delay as MII monitoring is disabled\n",
+                pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no down delay value specified.\n",
-                       bond->dev->name);
+                pr_err("%s: no down delay value specified.\n", bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
                 if ((new_value % bond->params.miimon) != 0) {
-                        pr_warning(DRV_NAME
-                                   ": %s: Warning: down delay (%d) is not a "
-                                   "multiple of miimon (%d), delay rounded "
-                                   "to %d ms\n",
+                        pr_warning("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
                                    bond->dev->name, new_value,
                                    bond->params.miimon,
                                    (new_value / bond->params.miimon) *
                                    bond->params.miimon);
                 }
                 bond->params.downdelay = new_value / bond->params.miimon;
-                pr_info(DRV_NAME ": %s: Setting down delay to %d.\n",
-                       bond->dev->name,
-                       bond->params.downdelay * bond->params.miimon);
+                pr_info("%s: Setting down delay to %d.\n",
+                        bond->dev->name,
+                        bond->params.downdelay * bond->params.miimon);
 
         }
 
@@ -823,41 +787,35 @@ static ssize_t bonding_store_updelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to set up delay as MII monitoring is disabled\n",
+                pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no up delay value specified.\n",
+                pr_err("%s: no up delay value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
                 if ((new_value % bond->params.miimon) != 0) {
-                        pr_warning(DRV_NAME
-                                   ": %s: Warning: up delay (%d) is not a "
-                                   "multiple of miimon (%d), updelay rounded "
-                                   "to %d ms\n",
+                        pr_warning("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
                                    bond->dev->name, new_value,
                                    bond->params.miimon,
                                    (new_value / bond->params.miimon) *
                                    bond->params.miimon);
                 }
                 bond->params.updelay = new_value / bond->params.miimon;
-                pr_info(DRV_NAME ": %s: Setting up delay to %d.\n",
-                       bond->dev->name, bond->params.updelay * bond->params.miimon);
-
+                pr_info("%s: Setting up delay to %d.\n",
+                        bond->dev->name,
+                        bond->params.updelay * bond->params.miimon);
         }
 
 out:
@@ -889,16 +847,14 @@ static ssize_t bonding_store_lacp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update LACP rate because interface is up.\n",
+                pr_err("%s: Unable to update LACP rate because interface is up.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (bond->params.mode != BOND_MODE_8023AD) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
+                pr_err("%s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
@@ -908,12 +864,11 @@ static ssize_t bonding_store_lacp(struct device *d,
 
         if ((new_value == 1) || (new_value == 0)) {
                 bond->params.lacp_fast = new_value;
-                pr_info(DRV_NAME ": %s: Setting LACP rate to %s (%d).\n",
+                pr_info("%s: Setting LACP rate to %s (%d).\n",
                         bond->dev->name, bond_lacp_tbl[new_value].modename,
                         new_value);
         } else {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid LACP rate value %.*s.\n",
+                pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
         }
@@ -943,9 +898,8 @@ static ssize_t bonding_store_ad_select(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update ad_select because interface "
-                       "is up.\n", bond->dev->name);
+                pr_err("%s: Unable to update ad_select because interface is up.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
@@ -954,13 +908,11 @@ static ssize_t bonding_store_ad_select(struct device *d,
 
         if (new_value != -1) {
                 bond->params.ad_select = new_value;
-                pr_info(DRV_NAME
-                       ": %s: Setting ad_select to %s (%d).\n",
-                       bond->dev->name, ad_select_tbl[new_value].modename,
-                       new_value);
+                pr_info("%s: Setting ad_select to %s (%d).\n",
+                        bond->dev->name, ad_select_tbl[new_value].modename,
+                        new_value);
         } else {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid ad_select value %.*s.\n",
+                pr_err("%s: Ignoring invalid ad_select value %.*s.\n",
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
         }
@@ -990,15 +942,13 @@ static ssize_t bonding_store_n_grat_arp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no num_grat_arp value specified.\n",
+                pr_err("%s: no num_grat_arp value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0 || new_value > 255) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
+                pr_err("%s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
                 goto out;
@@ -1031,16 +981,14 @@ static ssize_t bonding_store_n_unsol_na(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no num_unsol_na value specified.\n",
+                pr_err("%s: no num_unsol_na value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
 
         if (new_value < 0 || new_value > 255) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
+                pr_err("%s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
                 goto out;
@@ -1075,40 +1023,31 @@ static ssize_t bonding_store_miimon(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no miimon value specified.\n",
+                pr_err("%s: no miimon value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
-                pr_info(DRV_NAME
-                       ": %s: Setting MII monitoring interval to %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Setting MII monitoring interval to %d.\n",
+                        bond->dev->name, new_value);
                 bond->params.miimon = new_value;
                 if (bond->params.updelay)
-                        pr_info(DRV_NAME
-                              ": %s: Note: Updating updelay (to %d) "
-                              "since it is a multiple of the miimon value.\n",
-                              bond->dev->name,
-                              bond->params.updelay * bond->params.miimon);
+                        pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n",
+                                bond->dev->name,
+                                bond->params.updelay * bond->params.miimon);
                 if (bond->params.downdelay)
-                        pr_info(DRV_NAME
-                              ": %s: Note: Updating downdelay (to %d) "
-                              "since it is a multiple of the miimon value.\n",
-                              bond->dev->name,
-                              bond->params.downdelay * bond->params.miimon);
+                        pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value.\n",
+                                bond->dev->name,
+                                bond->params.downdelay * bond->params.miimon);
                 if (bond->params.arp_interval) {
-                        pr_info(DRV_NAME
-                               ": %s: MII monitoring cannot be used with "
-                               "ARP monitoring. Disabling ARP monitoring...\n",
-                               bond->dev->name);
+                        pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
+                                bond->dev->name);
                         bond->params.arp_interval = 0;
                         bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
                         if (bond->params.arp_validate) {
@@ -1176,17 +1115,15 @@ static ssize_t bonding_store_primary(struct device *d,
         write_lock_bh(&bond->curr_slave_lock);
 
         if (!USES_PRIMARY(bond->params.mode)) {
-                pr_info(DRV_NAME
-                       ": %s: Unable to set primary slave; %s is in mode %d\n",
-                       bond->dev->name, bond->dev->name, bond->params.mode);
+                pr_info("%s: Unable to set primary slave; %s is in mode %d\n",
+                        bond->dev->name, bond->dev->name, bond->params.mode);
         } else {
                 bond_for_each_slave(bond, slave, i) {
                         if (strnicmp
                             (slave->dev->name, buf,
                              strlen(slave->dev->name)) == 0) {
-                                pr_info(DRV_NAME
-                                       ": %s: Setting %s as primary slave.\n",
-                                       bond->dev->name, slave->dev->name);
+                                pr_info("%s: Setting %s as primary slave.\n",
+                                        bond->dev->name, slave->dev->name);
                                 bond->primary_slave = slave;
                                 strcpy(bond->params.primary, slave->dev->name);
                                 bond_select_active_slave(bond);
@@ -1197,15 +1134,13 @@ static ssize_t bonding_store_primary(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        pr_info(DRV_NAME
-                               ": %s: Setting primary slave to None.\n",
-                               bond->dev->name);
+                        pr_info("%s: Setting primary slave to None.\n",
+                                bond->dev->name);
                         bond->primary_slave = NULL;
                                 bond_select_active_slave(bond);
                 } else {
-                        pr_info(DRV_NAME
-                               ": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
-                               bond->dev->name, (int)strlen(buf) - 1, buf);
+                        pr_info("%s: Unable to set %.*s as primary slave as it is not a slave.\n",
+                                bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
         }
 out:
@@ -1244,8 +1179,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
 
         new_value = bond_parse_parm(buf, pri_reselect_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid primary_reselect value %.*s.\n",
+                pr_err("%s: Ignoring invalid primary_reselect value %.*s.\n",
                        bond->dev->name,
                        (int) strlen(buf) - 1, buf);
                 ret = -EINVAL;
@@ -1253,7 +1187,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
         }
 
         bond->params.primary_reselect = new_value;
-        pr_info(DRV_NAME ": %s: setting primary_reselect to %s (%d).\n",
+        pr_info("%s: setting primary_reselect to %s (%d).\n",
                 bond->dev->name, pri_reselect_tbl[new_value].modename,
                 new_value);
 
@@ -1291,20 +1225,18 @@ static ssize_t bonding_store_carrier(struct device *d,
 
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no use_carrier value specified.\n",
+                pr_err("%s: no use_carrier value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if ((new_value == 0) || (new_value == 1)) {
                 bond->params.use_carrier = new_value;
-                pr_info(DRV_NAME ": %s: Setting use_carrier to %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Setting use_carrier to %d.\n",
+                        bond->dev->name, new_value);
         } else {
-                pr_info(DRV_NAME
-                       ": %s: Ignoring invalid use_carrier value %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Ignoring invalid use_carrier value %d.\n",
+                        bond->dev->name, new_value);
         }
 out:
         return count;
@@ -1349,8 +1281,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
         write_lock_bh(&bond->curr_slave_lock);
 
         if (!USES_PRIMARY(bond->params.mode))
-                pr_info(DRV_NAME ": %s: Unable to change active slave;"
-                        " %s is in mode %d\n",
+                pr_info("%s: Unable to change active slave; %s is in mode %d\n",
                         bond->dev->name, bond->dev->name, bond->params.mode);
         else {
                 bond_for_each_slave(bond, slave, i) {
@@ -1361,9 +1292,9 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                 new_active = slave;
                                 if (new_active == old_active) {
                                         /* do nothing */
-                                        pr_info(DRV_NAME
-                                                ": %s: %s is already the current active slave.\n",
-                                                bond->dev->name, slave->dev->name);
+                                        pr_info("%s: %s is already the current active slave.\n",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                         goto out;
                                 }
                                 else {
@@ -1371,16 +1302,15 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                             (old_active) &&
                                             (new_active->link == BOND_LINK_UP) &&
                                             IS_UP(new_active->dev)) {
-                                                pr_info(DRV_NAME
-                                                        ": %s: Setting %s as active slave.\n",
-                                                        bond->dev->name, slave->dev->name);
+                                                pr_info("%s: Setting %s as active slave.\n",
+                                                        bond->dev->name,
+                                                        slave->dev->name);
                                                         bond_change_active_slave(bond, new_active);
                                         }
                                         else {
-                                                pr_info(DRV_NAME
-                                                        ": %s: Could not set %s as active slave; "
-                                                        "either %s is down or the link is down.\n",
-                                                        bond->dev->name, slave->dev->name,
+                                                pr_info("%s: Could not set %s as active slave; either %s is down or the link is down.\n",
+                                                        bond->dev->name,
+                                                        slave->dev->name,
                                                         slave->dev->name);
                                         }
                                         goto out;
@@ -1391,14 +1321,12 @@ static ssize_t bonding_store_active_slave(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        pr_info(DRV_NAME
-                                ": %s: Setting active slave to None.\n",
+                        pr_info("%s: Setting active slave to None.\n",
                                 bond->dev->name);
                         bond->primary_slave = NULL;
                         bond_select_active_slave(bond);
                 } else {
-                        pr_info(DRV_NAME ": %s: Unable to set %.*s"
-                                " as active slave as it is not a slave.\n",
+                        pr_info("%s: Unable to set %.*s as active slave as it is not a slave.\n",
                                 bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
         }
@@ -1600,8 +1528,7 @@ int bond_create_sysfs(void)
                 /* Is someone being kinky and naming a device bonding_master? */
                 if (__dev_get_by_name(&init_net,
                                       class_attr_bonding_masters.attr.name))
-                        pr_err("network device named %s already "
-                               "exists in sysfs",
+                        pr_err("network device named %s already exists in sysfs",
                                class_attr_bonding_masters.attr.name);
                 ret = 0;
         }
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 8c485aad1b94..05b751719bd5 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -50,7 +50,7 @@ config CAN_TI_HECC
 
 config CAN_MCP251X
         tristate "Microchip MCP251x SPI CAN controllers"
-        depends on CAN_DEV && SPI
+        depends on CAN_DEV && SPI && HAS_DMA
         ---help---
           Driver for the Microchip MCP251x SPI CAN controllers.
 
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index cbe3fce53e3b..166cc7e579c0 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -474,7 +474,7 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
         reg_msr = at91_read(priv, AT91_MSR(mb));
         if (reg_msr & AT91_MSR_MRTR)
                 cf->can_id |= CAN_RTR_FLAG;
-        cf->can_dlc = min_t(__u8, (reg_msr >> 16) & 0xf, 8);
+        cf->can_dlc = get_can_dlc((reg_msr >> 16) & 0xf);
 
         *(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
         *(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(mb));
@@ -1037,7 +1037,7 @@ static int __init at91_can_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irq = platform_get_irq(pdev, 0);
-        if (!res || !irq) {
+        if (!res || irq <= 0) {
                 err = -ENODEV;
                 goto exit_put;
         }
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index c7fc1de28173..0ec1524523cc 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -392,7 +392,7 @@ static void bfin_can_rx(struct net_device *dev, u16 isrc)
                 cf->can_id |= CAN_RTR_FLAG;
 
         /* get data length code */
-        cf->can_dlc = bfin_read16(&reg->chl[obj].dlc);
+        cf->can_dlc = get_can_dlc(bfin_read16(&reg->chl[obj].dlc) & 0xF);
 
         /* get payload */
         for (i = 0; i < 8; i += 2) {
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 78b1b69b2921..1a72ca066a17 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -403,9 +403,8 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
 
                 for (i = 1; i < RXBDAT_OFF; i++)
                         buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
-                len = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-                if (len > 8)
-                        len = 8;
+
+                len = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
                 for (; i < (RXBDAT_OFF + len); i++)
                         buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
         } else {
@@ -455,13 +454,7 @@ static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx)
                         (buf[RXBSIDL_OFF] >> RXBSIDL_SHIFT);
         }
         /* Data length */
-        frame->can_dlc = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-        if (frame->can_dlc > 8) {
-                dev_warn(&spi->dev, "invalid frame recevied\n");
-                priv->net->stats.rx_errors++;
-                dev_kfree_skb(skb);
-                return;
-        }
+        frame->can_dlc = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
         memcpy(frame->data, buf + RXBDAT_OFF, frame->can_dlc);
 
         priv->net->stats.rx_packets++;
@@ -997,7 +990,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
                         goto error_tx_buf;
                 }
                 priv->spi_rx_buf = kmalloc(SPI_TRANSFER_BUF_LEN, GFP_KERNEL);
-                if (!priv->spi_tx_buf) {
+                if (!priv->spi_rx_buf) {
                         ret = -ENOMEM;
                         goto error_rx_buf;
                 }
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index bb06dfb58f25..07346f880ca6 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -297,7 +297,8 @@ static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)
         frame->can_id |= can_id >> 1;
         if (can_id & 1)
                 frame->can_id |= CAN_RTR_FLAG;
-        frame->can_dlc = in_8(&regs->rx.dlr) & 0xf;
+
+        frame->can_dlc = get_can_dlc(in_8(&regs->rx.dlr) & 0xf);
 
         if (!(frame->can_id & CAN_RTR_FLAG)) {
                 void __iomem *data = &regs->rx.dsr1_0;
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index b4ba88a31075..542a4f7255b4 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -293,15 +293,14 @@ static void sja1000_rx(struct net_device *dev)
         uint8_t fi;
         uint8_t dreg;
         canid_t id;
-        uint8_t dlc;
         int i;
 
+        /* create zero'ed CAN frame buffer */
         skb = alloc_can_skb(dev, &cf);
         if (skb == NULL)
                 return;
 
         fi = priv->read_reg(priv, REG_FI);
-        dlc = fi & 0x0F;
 
         if (fi & FI_FF) {
                 /* extended frame format (EFF) */
@@ -318,16 +317,15 @@ static void sja1000_rx(struct net_device *dev)
                     | (priv->read_reg(priv, REG_ID2) >> 5);
         }
 
-        if (fi & FI_RTR)
+        if (fi & FI_RTR) {
                 id |= CAN_RTR_FLAG;
+        } else {
+                cf->can_dlc = get_can_dlc(fi & 0x0F);
+                for (i = 0; i < cf->can_dlc; i++)
+                        cf->data[i] = priv->read_reg(priv, dreg++);
+        }
 
         cf->can_id = id;
-        cf->can_dlc = dlc;
-        for (i = 0; i < dlc; i++)
-                cf->data[i] = priv->read_reg(priv, dreg++);
-
-        while (i < 8)
-                cf->data[i++] = 0;
 
         /* release receive buffer */
         priv->write_reg(priv, REG_CMR, CMD_RRB);
@@ -335,7 +333,7 @@ static void sja1000_rx(struct net_device *dev)
         netif_rx(skb);
 
         stats->rx_packets++;
-        stats->rx_bytes += dlc;
+        stats->rx_bytes += cf->can_dlc;
 }
 
 static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 07e8016b17ec..5c993c2da528 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -552,7 +552,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno)
         data = hecc_read_mbx(priv, mbxno, HECC_CANMCF);
         if (data & HECC_CANMCF_RTR)
                 cf->can_id |= CAN_RTR_FLAG;
-        cf->can_dlc = data & 0xF;
+        cf->can_dlc = get_can_dlc(data & 0xF);
         data = hecc_read_mbx(priv, mbxno, HECC_CANMDL);
         *(u32 *)(cf->data) = cpu_to_be32(data);
         if (cf->can_dlc > 4) {
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 591eb0eb1c2b..efbb05c71bf4 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -316,7 +316,7 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
                 return;
 
         cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
-        cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
+        cf->can_dlc = get_can_dlc(msg->msg.can_msg.length & 0xF);
 
         if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME ||
             msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME)
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 678222389407..8d0be26f94e3 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1163,7 +1163,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         priv->dev = dev;
         priv->ring_size = 64;
         priv->msg_enable = netif_msg_init(debug_level, 0xff);
-        memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
+        memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr));
 
         snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
 
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index af9321617ce4..0e79cef95c0a 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -1325,8 +1325,7 @@ net_open(struct net_device *dev)
                 write_irq(dev, lp->chip_type, dev->irq);
                 ret = request_irq(dev->irq, net_interrupt, 0, dev->name, dev);
                 if (ret) {
-                        if (net_debug)
-                                printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq);
+                        printk(KERN_ERR "cs89x0: request_irq(%d) failed\n", dev->irq);
                         goto bad_out;
                 }
         }
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 8edac8915ea8..33c4fe26178c 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2272,7 +2272,7 @@ static int emac_mii_reset(struct mii_bus *bus)
         unsigned int clk_div;
         int mdio_bus_freq = emac_bus_frequency;
 
-        if (mdio_max_freq & mdio_bus_freq)
+        if (mdio_max_freq && mdio_bus_freq)
                 clk_div = ((mdio_bus_freq / mdio_max_freq) - 1);
         else
                 clk_div = 0xFF;
@@ -2711,6 +2711,8 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
         SET_ETHTOOL_OPS(ndev, &ethtool_ops);
         netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
 
+        clk_enable(emac_clk);
+
         /* register the network device */
         SET_NETDEV_DEV(ndev, &pdev->dev);
         rc = register_netdev(ndev);
@@ -2720,7 +2722,6 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
                 goto netdev_reg_err;
         }
 
-        clk_enable(emac_clk);
 
         /* MII/Phy intialisation, mdio bus registration */
         emac_mii = mdiobus_alloc();
@@ -2760,6 +2761,7 @@ mdiobus_quit:
 
 netdev_reg_err:
 mdio_alloc_err:
+        clk_disable(emac_clk);
 no_irq_res:
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, res->end - res->start + 1);
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 0cbe3c0e7c06..b37730065688 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -1646,7 +1646,7 @@ dm9000_drv_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops dm9000_drv_pm_ops = {
+static const struct dev_pm_ops dm9000_drv_pm_ops = {
         .suspend        = dm9000_drv_suspend,
         .resume         = dm9000_drv_resume,
 };
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 929701ca07d3..839fb2b136d3 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1829,6 +1829,7 @@ static int e100_alloc_cbs(struct nic *nic)
                                   &nic->cbs_dma_addr);
         if (!nic->cbs)
                 return -ENOMEM;
+        memset(nic->cbs, 0, count * sizeof(struct cb));
 
         for (cb = nic->cbs, i = 0; i < count; cb++, i++) {
                 cb->next = (i + 1 < count) ? cb + 1 : nic->cbs;
@@ -1837,7 +1838,6 @@ static int e100_alloc_cbs(struct nic *nic)
                 cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb);
                 cb->link = cpu_to_le32(nic->cbs_dma_addr +
                         ((i+1) % count) * sizeof(struct cb));
-                cb->skb = NULL;
         }
 
         nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs;
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index c1a42cfc80ba..02d67d047d96 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -237,6 +237,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
         /* Set if manageability features are enabled. */
         mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK)
                         ? true : false;
+        /* Adaptive IFS supported */
+        mac->adaptive_ifs = true;
 
         /* check for link */
         switch (hw->phy.media_type) {
@@ -1290,7 +1292,6 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw)
 static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
 {
         u32 ctrl;
-        u32 led_ctrl;
         s32 ret_val;
 
         ctrl = er32(CTRL);
@@ -1305,11 +1306,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
                 break;
         case e1000_phy_igp_2:
                 ret_val = e1000e_copper_link_setup_igp(hw);
-                /* Setup activity LED */
-                led_ctrl = er32(LEDCTL);
-                led_ctrl &= IGP_ACTIVITY_LED_MASK;
-                led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-                ew32(LEDCTL, led_ctrl);
                 break;
         default:
                 return -E1000_ERR_PHY;
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index cebbd9079d53..d6ee28f6ea08 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -582,7 +582,6 @@ extern s32 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
 extern s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);
 extern s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
                                          u16 data);
-extern s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow);
 extern s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw);
 extern s32 e1000_copper_link_setup_82577(struct e1000_hw *hw);
 extern s32 e1000_check_polarity_82577(struct e1000_hw *hw);
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 3028f23da891..e2aa3b788564 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -224,6 +224,8 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         /* Set if manageability features are enabled. */
         mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK)
                         ? true : false;
+        /* Adaptive IFS not supported */
+        mac->adaptive_ifs = false;
 
         /* check for link */
         switch (hw->phy.media_type) {
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 2784cf44a6f3..eccf29b75c41 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -818,6 +818,7 @@ struct e1000_mac_info {
 
         u8  forced_speed_duplex;
 
+        bool adaptive_ifs;
         bool arc_subsystem_valid;
         bool autoneg;
         bool autoneg_failed;
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 9b09246af064..8b6ecd127889 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -138,6 +138,10 @@
 #define E1000_NVM_K1_CONFIG 0x1B /* NVM K1 Config Word */
 #define E1000_NVM_K1_ENABLE 0x1  /* NVM Enable K1 bit */
 
+/* KMRN Mode Control */
+#define HV_KMRN_MODE_CTRL      PHY_REG(769, 16)
+#define HV_KMRN_MDIO_SLOW      0x0400
+
 /* ICH GbE Flash Hardware Sequencing Flash Status Register bit breakdown */
 /* Offset 04h HSFSTS */
 union ich8_hws_flash_status {
@@ -219,6 +223,7 @@ static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active);
 static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
 static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw);
 static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
+static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
 
 static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
 {
@@ -270,7 +275,21 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
         phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
 
         phy->id = e1000_phy_unknown;
-        e1000e_get_phy_id(hw);
+        ret_val = e1000e_get_phy_id(hw);
+        if (ret_val)
+                goto out;
+        if ((phy->id == 0) || (phy->id == PHY_REVISION_MASK)) {
+                /*
+                 * In case the PHY needs to be in mdio slow mode (eg. 82577),
+                 * set slow mode and try to get the PHY id again.
+                 */
+                ret_val = e1000_set_mdio_slow_mode_hv(hw);
+                if (ret_val)
+                        goto out;
+                ret_val = e1000e_get_phy_id(hw);
+                if (ret_val)
+                        goto out;
+        }
         phy->type = e1000e_get_phy_type_from_id(phy->id);
 
         switch (phy->type) {
@@ -292,6 +311,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
                 break;
         }
 
+out:
         return ret_val;
 }
 
@@ -454,6 +474,8 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
                 mac->rar_entry_count--;
         /* Set if manageability features are enabled. */
         mac->arc_subsystem_valid = true;
+        /* Adaptive IFS supported */
+        mac->adaptive_ifs = true;
 
         /* LED operations */
         switch (mac->type) {
@@ -1074,16 +1096,44 @@ out:
 
 
 /**
+ *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
+ *  @hw:   pointer to the HW structure
+ **/
+static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 data;
+
+        ret_val = e1e_rphy(hw, HV_KMRN_MODE_CTRL, &data);
+        if (ret_val)
+                return ret_val;
+
+        data |= HV_KMRN_MDIO_SLOW;
+
+        ret_val = e1e_wphy(hw, HV_KMRN_MODE_CTRL, data);
+
+        return ret_val;
+}
+
+/**
  *  e1000_hv_phy_workarounds_ich8lan - A series of Phy workarounds to be
  *  done after every PHY reset.
  **/
 static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
 {
         s32 ret_val = 0;
+        u16 phy_data;
 
         if (hw->mac.type != e1000_pchlan)
                 return ret_val;
 
+        /* Set MDIO slow mode before any other MDIO access */
+        if (hw->phy.type == e1000_phy_82577) {
+                ret_val = e1000_set_mdio_slow_mode_hv(hw);
+                if (ret_val)
+                        goto out;
+        }
+
         if (((hw->phy.type == e1000_phy_82577) &&
              ((hw->phy.revision == 1) || (hw->phy.revision == 2))) ||
             ((hw->phy.type == e1000_phy_82578) && (hw->phy.revision == 1))) {
@@ -1116,16 +1166,32 @@ static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
 
         hw->phy.addr = 1;
         ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, 0);
+        hw->phy.ops.release(hw);
         if (ret_val)
                 goto out;
-        hw->phy.ops.release(hw);
 
         /*
          * Configure the K1 Si workaround during phy reset assuming there is
          * link so that it disables K1 if link is in 1Gbps.
          */
         ret_val = e1000_k1_gig_workaround_hv(hw, true);
+        if (ret_val)
+                goto out;
 
+        /* Workaround for link disconnects on a busy hub in half duplex */
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val)
+                goto out;
+        ret_val = hw->phy.ops.read_reg_locked(hw,
+                                              PHY_REG(BM_PORT_CTRL_PAGE, 17),
+                                              &phy_data);
+        if (ret_val)
+                goto release;
+        ret_val = hw->phy.ops.write_reg_locked(hw,
+                                               PHY_REG(BM_PORT_CTRL_PAGE, 17),
+                                               phy_data & 0x00FF);
+release:
+        hw->phy.ops.release(hw);
 out:
         return ret_val;
 }
@@ -1182,6 +1248,7 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
         /* Allow time for h/w to get to a quiescent state after reset */
         mdelay(10);
 
+        /* Perform any necessary post-reset workarounds */
         if (hw->mac.type == e1000_pchlan) {
                 ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
                 if (ret_val)
@@ -2482,6 +2549,10 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         if (!ret_val)
                 e1000_release_swflag_ich8lan(hw);
 
+        /* Perform any necessary post-reset workarounds */
+        if (hw->mac.type == e1000_pchlan)
+                ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
+
         if (ctrl & E1000_CTRL_PHY_RST)
                 ret_val = hw->phy.ops.get_cfg_done(hw);
 
@@ -2526,9 +2597,6 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         kab |= E1000_KABGTXD_BGSQLBIAS;
         ew32(KABGTXD, kab);
 
-        if (hw->mac.type == e1000_pchlan)
-                ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
-
 out:
         return ret_val;
 }
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index a86c17548c1e..2fa9b36a2c5a 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -125,6 +125,7 @@ void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value)
 void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
 {
         u32 i;
+        u8 mac_addr[ETH_ALEN] = {0};
 
         /* Setup the receive address */
         e_dbg("Programming MAC Address into RAR[0]\n");
@@ -133,12 +134,8 @@ void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
 
         /* Zero out the other (rar_entry_count - 1) receive addresses */
         e_dbg("Clearing RAR[1-%u]\n", rar_count-1);
-        for (i = 1; i < rar_count; i++) {
-                E1000_WRITE_REG_ARRAY(hw, E1000_RA, (i << 1), 0);
-                e1e_flush();
-                E1000_WRITE_REG_ARRAY(hw, E1000_RA, ((i << 1) + 1), 0);
-                e1e_flush();
-        }
+        for (i = 1; i < rar_count; i++)
+                e1000e_rar_set(hw, mac_addr, i);
 }
 
 /**
@@ -164,10 +161,19 @@ void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
 
         rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
 
-        rar_high |= E1000_RAH_AV;
+        /* If MAC address zero, no need to set the AV bit */
+        if (rar_low || rar_high)
+                rar_high |= E1000_RAH_AV;
 
-        E1000_WRITE_REG_ARRAY(hw, E1000_RA, (index << 1), rar_low);
-        E1000_WRITE_REG_ARRAY(hw, E1000_RA, ((index << 1) + 1), rar_high);
+        /*
+         * Some bridges will combine consecutive 32-bit writes into
+         * a single burst write, which will malfunction on some parts.
+         * The flushes avoid this.
+         */
+        ew32(RAL(index), rar_low);
+        e1e_flush();
+        ew32(RAH(index), rar_high);
+        e1e_flush();
 }
 
 /**
@@ -1609,6 +1615,11 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 {
         struct e1000_mac_info *mac = &hw->mac;
 
+        if (!mac->adaptive_ifs) {
+                e_dbg("Not in Adaptive IFS mode!\n");
+                goto out;
+        }
+
         mac->current_ifs_val = 0;
         mac->ifs_min_val = IFS_MIN;
         mac->ifs_max_val = IFS_MAX;
@@ -1617,6 +1628,8 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 
         mac->in_ifs_mode = false;
         ew32(AIT, 0);
+out:
+        return;
 }
 
 /**
@@ -1630,6 +1643,11 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
 {
         struct e1000_mac_info *mac = &hw->mac;
 
+        if (!mac->adaptive_ifs) {
+                e_dbg("Not in Adaptive IFS mode!\n");
+                goto out;
+        }
+
         if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
                 if (mac->tx_packet_delta > MIN_NUM_XMITS) {
                         mac->in_ifs_mode = true;
@@ -1650,6 +1668,8 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                         ew32(AIT, 0);
                 }
         }
+out:
+        return;
 }
 
 /**
@@ -2287,10 +2307,12 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         s32 ret_val, hdr_csum, csum;
         u8 i, len;
 
+        hw->mac.tx_pkt_filtering = true;
+
         /* No manageability, no filtering */
         if (!e1000e_check_mng_mode(hw)) {
                 hw->mac.tx_pkt_filtering = false;
-                return 0;
+                goto out;
         }
 
         /*
@@ -2298,9 +2320,9 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
          * reason, disable filtering.
          */
         ret_val = e1000_mng_enable_host_if(hw);
-        if (ret_val != 0) {
+        if (ret_val) {
                 hw->mac.tx_pkt_filtering = false;
-                return ret_val;
+                goto out;
         }
 
         /* Read in the header.  Length and offset are in dwords. */
@@ -2319,17 +2341,17 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
          */
         if ((hdr_csum != csum) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
                 hw->mac.tx_pkt_filtering = true;
-                return 1;
+                goto out;
         }
 
         /* Cookie area is valid, make the final check for filtering. */
         if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
                 hw->mac.tx_pkt_filtering = false;
-                return 0;
+                goto out;
         }
 
-        hw->mac.tx_pkt_filtering = true;
-        return 1;
+out:
+        return hw->mac.tx_pkt_filtering;
 }
 
 /**
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 762b697ce731..c45965a256b6 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3315,24 +3315,24 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82577)) {
                 e1e_rphy(hw, HV_SCC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_SCC_LOWER, &phy_data);
-                adapter->stats.scc += phy_data;
+                if (!e1e_rphy(hw, HV_SCC_LOWER, &phy_data))
+                        adapter->stats.scc += phy_data;
 
                 e1e_rphy(hw, HV_ECOL_UPPER, &phy_data);
-                e1e_rphy(hw, HV_ECOL_LOWER, &phy_data);
-                adapter->stats.ecol += phy_data;
+                if (!e1e_rphy(hw, HV_ECOL_LOWER, &phy_data))
+                        adapter->stats.ecol += phy_data;
 
                 e1e_rphy(hw, HV_MCC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_MCC_LOWER, &phy_data);
-                adapter->stats.mcc += phy_data;
+                if (!e1e_rphy(hw, HV_MCC_LOWER, &phy_data))
+                        adapter->stats.mcc += phy_data;
 
                 e1e_rphy(hw, HV_LATECOL_UPPER, &phy_data);
-                e1e_rphy(hw, HV_LATECOL_LOWER, &phy_data);
-                adapter->stats.latecol += phy_data;
+                if (!e1e_rphy(hw, HV_LATECOL_LOWER, &phy_data))
+                        adapter->stats.latecol += phy_data;
 
                 e1e_rphy(hw, HV_DC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_DC_LOWER, &phy_data);
-                adapter->stats.dc += phy_data;
+                if (!e1e_rphy(hw, HV_DC_LOWER, &phy_data))
+                        adapter->stats.dc += phy_data;
         } else {
                 adapter->stats.scc += er32(SCC);
                 adapter->stats.ecol += er32(ECOL);
@@ -3360,8 +3360,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82577)) {
                 e1e_rphy(hw, HV_COLC_UPPER, &phy_data);
-                e1e_rphy(hw, HV_COLC_LOWER, &phy_data);
-                hw->mac.collision_delta = phy_data;
+                if (!e1e_rphy(hw, HV_COLC_LOWER, &phy_data))
+                        hw->mac.collision_delta = phy_data;
         } else {
                 hw->mac.collision_delta = er32(COLC);
         }
@@ -3372,8 +3372,8 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82577)) {
                 e1e_rphy(hw, HV_TNCRS_UPPER, &phy_data);
-                e1e_rphy(hw, HV_TNCRS_LOWER, &phy_data);
-                adapter->stats.tncrs += phy_data;
+                if (!e1e_rphy(hw, HV_TNCRS_LOWER, &phy_data))
+                        adapter->stats.tncrs += phy_data;
         } else {
                 if ((hw->mac.type != e1000_82574) &&
                     (hw->mac.type != e1000_82583))
@@ -4674,6 +4674,7 @@ static int e1000_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
+        pci_save_state(pdev);
         e1000e_disable_l1aspm(pdev);
 
         err = pci_enable_device_mem(pdev);
@@ -4825,6 +4826,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
         } else {
                 pci_set_master(pdev);
                 pci_restore_state(pdev);
+                pci_save_state(pdev);
 
                 pci_enable_wake(pdev, PCI_D3hot, 0);
                 pci_enable_wake(pdev, PCI_D3cold, 0);
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 55a2c0acfee7..7f3ceb9dad6a 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -152,32 +152,9 @@ s32 e1000e_get_phy_id(struct e1000_hw *hw)
                 if (phy->id != 0 && phy->id != PHY_REVISION_MASK)
                         goto out;
 
-                /*
-                 * If the PHY ID is still unknown, we may have an 82577
-                 * without link.  We will try again after setting Slow MDIC
-                 * mode. No harm in trying again in this case since the PHY
-                 * ID is unknown at this point anyway.
-                 */
-                ret_val = phy->ops.acquire(hw);
-                if (ret_val)
-                        goto out;
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, true);
-                if (ret_val)
-                        goto out;
-                phy->ops.release(hw);
-
                 retry_count++;
         }
 out:
-        /* Revert to MDIO fast mode, if applicable */
-        if (retry_count) {
-                ret_val = phy->ops.acquire(hw);
-                if (ret_val)
-                        return ret_val;
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
-                phy->ops.release(hw);
-        }
-
         return ret_val;
 }
 
@@ -2791,38 +2768,6 @@ static s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active)
 }
 
 /**
- *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
- *  @hw:   pointer to the HW structure
- *  @slow: true for slow mode, false for normal mode
- *
- *  Assumes semaphore already acquired.
- **/
-s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow)
-{
-        s32 ret_val = 0;
-        u16 data = 0;
-
-        /* Set MDIO mode - page 769, register 16: 0x2580==slow, 0x2180==fast */
-        hw->phy.addr = 1;
-        ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                         (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
-        if (ret_val)
-                goto out;
-
-        ret_val = e1000e_write_phy_reg_mdic(hw, BM_CS_CTRL1,
-                                           (0x2180 | (slow << 10)));
-        if (ret_val)
-                goto out;
-
-        /* dummy read when reverting to fast mode - throw away result */
-        if (!slow)
-                ret_val = e1000e_read_phy_reg_mdic(hw, BM_CS_CTRL1, &data);
-
-out:
-        return ret_val;
-}
-
-/**
  *  __e1000_read_phy_reg_hv -  Read HV PHY register
  *  @hw: pointer to the HW structure
  *  @offset: register offset to be read
@@ -2839,7 +2784,6 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
         s32 ret_val;
         u16 page = BM_PHY_REG_PAGE(offset);
         u16 reg = BM_PHY_REG_NUM(offset);
-        bool in_slow_mode = false;
 
         if (!locked) {
                 ret_val = hw->phy.ops.acquire(hw);
@@ -2847,16 +2791,6 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
                         return ret_val;
         }
 
-        /* Workaround failure in MDIO access while cable is disconnected */
-        if ((hw->phy.type == e1000_phy_82577) &&
-            !(er32(STATUS) & E1000_STATUS_LU)) {
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, true);
-                if (ret_val)
-                        goto out;
-
-                in_slow_mode = true;
-        }
-
         /* Page 800 works differently than the rest so it has its own func */
         if (page == BM_WUC_PAGE) {
                 ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset,
@@ -2893,10 +2827,6 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
         ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
                                           data);
 out:
-        /* Revert to MDIO fast mode, if applicable */
-        if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-                ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
-
         if (!locked)
                 hw->phy.ops.release(hw);
 
@@ -2948,7 +2878,6 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
         s32 ret_val;
         u16 page = BM_PHY_REG_PAGE(offset);
         u16 reg = BM_PHY_REG_NUM(offset);
-        bool in_slow_mode = false;
 
         if (!locked) {
                 ret_val = hw->phy.ops.acquire(hw);
@@ -2956,16 +2885,6 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
                         return ret_val;
         }
 
-        /* Workaround failure in MDIO access while cable is disconnected */
-        if ((hw->phy.type == e1000_phy_82577) &&
-            !(er32(STATUS) & E1000_STATUS_LU)) {
-                ret_val = e1000_set_mdio_slow_mode_hv(hw, true);
-                if (ret_val)
-                        goto out;
-
-                in_slow_mode = true;
-        }
-
         /* Page 800 works differently than the rest so it has its own func */
         if (page == BM_WUC_PAGE) {
                 ret_val = e1000_access_phy_wakeup_reg_bm(hw, offset,
@@ -3019,10 +2938,6 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
                                           data);
 
 out:
-        /* Revert to MDIO fast mode, if applicable */
-        if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-                ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
-
         if (!locked)
                 hw->phy.ops.release(hw);
 
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index 25fabb3eedc5..d5160edf2fcf 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -46,6 +46,11 @@
 #include "gianfar.h"
 #include "fsl_pq_mdio.h"
 
+struct fsl_pq_mdio_priv {
+        void __iomem *map;
+        struct fsl_pq_mdio __iomem *regs;
+};
+
 /*
  * Write value to the PHY at mii_id at register regnum,
  * on the bus attached to the local interface, which may be different from the
@@ -105,7 +110,9 @@ int fsl_pq_local_mdio_read(struct fsl_pq_mdio __iomem *regs,
 
 static struct fsl_pq_mdio __iomem *fsl_pq_mdio_get_regs(struct mii_bus *bus)
 {
-        return (void __iomem __force *)bus->priv;
+        struct fsl_pq_mdio_priv *priv = bus->priv;
+
+        return priv->regs;
 }
 
 /*
@@ -266,6 +273,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
 {
         struct device_node *np = ofdev->node;
         struct device_node *tbi;
+        struct fsl_pq_mdio_priv *priv;
         struct fsl_pq_mdio __iomem *regs = NULL;
         void __iomem *map;
         u32 __iomem *tbipa;
@@ -274,14 +282,19 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
         u64 addr = 0, size = 0;
         int err = 0;
 
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
         new_bus = mdiobus_alloc();
         if (NULL == new_bus)
-                return -ENOMEM;
+                goto err_free_priv;
 
         new_bus->name = "Freescale PowerQUICC MII Bus",
         new_bus->read = &fsl_pq_mdio_read,
         new_bus->write = &fsl_pq_mdio_write,
         new_bus->reset = &fsl_pq_mdio_reset,
+        new_bus->priv = priv;
         fsl_pq_mdio_bus_name(new_bus->id, np);
 
         /* Set the PHY base address */
@@ -291,6 +304,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
                 err = -ENOMEM;
                 goto err_free_bus;
         }
+        priv->map = map;
 
         if (of_device_is_compatible(np, "fsl,gianfar-mdio") ||
                         of_device_is_compatible(np, "fsl,gianfar-tbi") ||
@@ -298,8 +312,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
                         of_device_is_compatible(np, "ucc_geth_phy"))
                 map -= offsetof(struct fsl_pq_mdio, miimcfg);
         regs = map;
-
-        new_bus->priv = (void __force *)regs;
+        priv->regs = regs;
 
         new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
 
@@ -392,10 +405,11 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
 err_free_irqs:
         kfree(new_bus->irq);
 err_unmap_regs:
-        iounmap(regs);
+        iounmap(priv->map);
 err_free_bus:
         kfree(new_bus);
-
+err_free_priv:
+        kfree(priv);
         return err;
 }
 
@@ -404,14 +418,16 @@ static int fsl_pq_mdio_remove(struct of_device *ofdev)
 {
         struct device *device = &ofdev->dev;
         struct mii_bus *bus = dev_get_drvdata(device);
+        struct fsl_pq_mdio_priv *priv = bus->priv;
 
         mdiobus_unregister(bus);
 
         dev_set_drvdata(device, NULL);
 
-        iounmap(fsl_pq_mdio_get_regs(bus));
+        iounmap(priv->map);
         bus->priv = NULL;
         mdiobus_free(bus);
+        kfree(priv);
 
         return 0;
 }
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6850dc0a7b91..8bd3c9f17532 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -143,7 +143,6 @@ void gfar_start(struct net_device *dev);
 static void gfar_clear_exact_match(struct net_device *dev);
 static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
 static int gfar_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-u16 gfar_select_queue(struct net_device *dev, struct sk_buff *skb);
 
 MODULE_AUTHOR("Freescale Semiconductor, Inc");
 MODULE_DESCRIPTION("Gianfar Ethernet Driver");
@@ -357,8 +356,11 @@ static void gfar_init_mac(struct net_device *ndev)
         /* Configure the coalescing support */
         gfar_configure_coalescing(priv, 0xFF, 0xFF);
 
-        if (priv->rx_filer_enable)
+        if (priv->rx_filer_enable) {
                 rctrl |= RCTRL_FILREN;
+                /* Program the RIR0 reg with the required distribution */
+                gfar_write(&regs->rir0, DEFAULT_RIR0);
+        }
 
         if (priv->rx_csum_enable)
                 rctrl |= RCTRL_CHECKSUMMING;
@@ -414,6 +416,36 @@ static void gfar_init_mac(struct net_device *ndev)
         gfar_write(&regs->fifo_tx_starve_shutoff, priv->fifo_starve_off);
 }
 
+static struct net_device_stats *gfar_get_stats(struct net_device *dev)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+        struct netdev_queue *txq;
+        unsigned long rx_packets = 0, rx_bytes = 0, rx_dropped = 0;
+        unsigned long tx_packets = 0, tx_bytes = 0;
+        int i = 0;
+
+        for (i = 0; i < priv->num_rx_queues; i++) {
+                rx_packets += priv->rx_queue[i]->stats.rx_packets;
+                rx_bytes += priv->rx_queue[i]->stats.rx_bytes;
+                rx_dropped += priv->rx_queue[i]->stats.rx_dropped;
+        }
+
+        dev->stats.rx_packets = rx_packets;
+        dev->stats.rx_bytes = rx_bytes;
+        dev->stats.rx_dropped = rx_dropped;
+
+        for (i = 0; i < priv->num_tx_queues; i++) {
+                txq = netdev_get_tx_queue(dev, i);
+                tx_bytes += txq->tx_bytes;
+                tx_packets += txq->tx_packets;
+        }
+
+        dev->stats.tx_bytes = tx_bytes;
+        dev->stats.tx_packets = tx_packets;
+
+        return &dev->stats;
+}
+
 static const struct net_device_ops gfar_netdev_ops = {
         .ndo_open = gfar_enet_open,
         .ndo_start_xmit = gfar_start_xmit,
@@ -422,7 +454,7 @@ static const struct net_device_ops gfar_netdev_ops = {
         .ndo_set_multicast_list = gfar_set_multi,
         .ndo_tx_timeout = gfar_timeout,
         .ndo_do_ioctl = gfar_ioctl,
-        .ndo_select_queue = gfar_select_queue,
+        .ndo_get_stats = gfar_get_stats,
         .ndo_vlan_rx_register = gfar_vlan_rx_register,
         .ndo_set_mac_address = eth_mac_addr,
         .ndo_validate_addr = eth_validate_addr,
@@ -472,10 +504,6 @@ static inline int gfar_uses_fcb(struct gfar_private *priv)
         return priv->vlgrp || priv->rx_csum_enable;
 }
 
-u16 gfar_select_queue(struct net_device *dev, struct sk_buff *skb)
-{
-        return skb_get_queue_mapping(skb);
-}
 static void free_tx_pointers(struct gfar_private *priv)
 {
         int i = 0;
@@ -1022,6 +1050,9 @@ static int gfar_probe(struct of_device *ofdev,
                 priv->rx_queue[i]->rxic = DEFAULT_RXIC;
         }
 
+        /* enable filer if using multiple RX queues*/
+        if(priv->num_rx_queues > 1)
+                priv->rx_filer_enable = 1;
         /* Enable most messages by default */
         priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
 
@@ -1937,7 +1968,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         /* Update transmit stats */
-        dev->stats.tx_bytes += skb->len;
+        txq->tx_bytes += skb->len;
+        txq->tx_packets ++;
 
         txbdp = txbdp_start = tx_queue->cur_tx;
 
@@ -2295,8 +2327,6 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
         tx_queue->skb_dirtytx = skb_dirtytx;
         tx_queue->dirty_tx = bdp;
 
-        dev->stats.tx_packets += howmany;
-
         return howmany;
 }
 
@@ -2434,10 +2464,11 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         fcb = (struct rxfcb *)skb->data;
 
         /* Remove the FCB from the skb */
-        skb_set_queue_mapping(skb, fcb->rq);
         /* Remove the padded bytes, if there are any */
-        if (amount_pull)
+        if (amount_pull) {
+                skb_record_rx_queue(skb, fcb->rq);
                 skb_pull(skb, amount_pull);
+        }
 
         if (priv->rx_csum_enable)
                 gfar_rx_checksum(skb, fcb);
@@ -2510,22 +2541,22 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                         }
                 } else {
                         /* Increment the number of packets */
-                        dev->stats.rx_packets++;
+                        rx_queue->stats.rx_packets++;
                         howmany++;
 
                         if (likely(skb)) {
                                 pkt_len = bdp->length - ETH_FCS_LEN;
                                 /* Remove the FCS from the packet length */
                                 skb_put(skb, pkt_len);
-                                dev->stats.rx_bytes += pkt_len;
-
+                                rx_queue->stats.rx_bytes += pkt_len;
+                                skb_record_rx_queue(skb, rx_queue->qindex);
                                 gfar_process_frame(dev, skb, amount_pull);
 
                         } else {
                                 if (netif_msg_rx_err(priv))
                                         printk(KERN_WARNING
                                                "%s: Missing skb!\n", dev->name);
-                                dev->stats.rx_dropped++;
+                                rx_queue->stats.rx_dropped++;
                                 priv->extra_stats.rx_skbmissing++;
                         }
 
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index cbb451011cb5..3d72dc43dca5 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -333,7 +333,7 @@ extern const char gfar_driver_version[];
 #define IMASK_BSY               0x20000000
 #define IMASK_EBERR             0x10000000
 #define IMASK_MSRO              0x04000000
-#define IMASK_GRSC              0x02000000
+#define IMASK_GTSC              0x02000000
 #define IMASK_BABT              0x01000000
 #define IMASK_TXC               0x00800000
 #define IMASK_TXEEN             0x00400000
@@ -344,7 +344,7 @@ extern const char gfar_driver_version[];
 #define IMASK_XFUN              0x00010000
 #define IMASK_RXB0              0x00008000
 #define IMASK_MAG               0x00000800
-#define IMASK_GTSC              0x00000100
+#define IMASK_GRSC              0x00000100
 #define IMASK_RXFEN0            0x00000080
 #define IMASK_FIR               0x00000008
 #define IMASK_FIQ               0x00000004
@@ -401,6 +401,10 @@ extern const char gfar_driver_version[];
 #define FPR_FILER_MASK  0xFFFFFFFF
 #define MAX_FILER_IDX   0xFF
 
+/* This default RIR value directly corresponds
+ * to the 3-bit hash value generated */
+#define DEFAULT_RIR0    0x05397700
+
 /* RQFCR register bits */
 #define RQFCR_GPI               0x80000000
 #define RQFCR_HASHTBL_Q         0x00000000
@@ -936,6 +940,15 @@ struct gfar_priv_tx_q {
         unsigned short txtime;
 };
 
+/*
+ * Per RX queue stats
+ */
+struct rx_q_stats {
+        unsigned long rx_packets;
+        unsigned long rx_bytes;
+        unsigned long rx_dropped;
+};
+
 /**
  *      struct gfar_priv_rx_q - per rx queue structure
  *      @rxlock: per queue rx spin lock
@@ -958,6 +971,7 @@ struct gfar_priv_rx_q {
         struct  rxbd8 *cur_rx;
         struct  net_device *dev;
         struct gfar_priv_grp *grp;
+        struct rx_q_stats stats;
         u16     skb_currx;
         u16     qindex;
         unsigned int    rx_ring_size;
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index ae5f11c8fc13..bdadf3e23c94 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -248,6 +248,7 @@ static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         unsigned char *ptr;
         struct bpqdev *bpq;
+        struct net_device *orig_dev;
         int size;
 
         /*
@@ -282,8 +283,9 @@ static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev)
 
         bpq = netdev_priv(dev);
 
+        orig_dev = dev;
         if ((dev = bpq_get_ether_dev(dev)) == NULL) {
-                dev->stats.tx_dropped++;
+                orig_dev->stats.tx_dropped++;
                 kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 090a6d3af112..052c74091d91 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -87,6 +87,7 @@ History:
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
 
@@ -988,7 +989,7 @@ static int __devinit ibmlana_init_one(struct device *kdev)
 
         /* copy out MAC address */
 
-        for (z = 0; z < sizeof(dev->dev_addr); z++)
+        for (z = 0; z < ETH_ALEN; z++)
                 dev->dev_addr[z] = inb(dev->base_addr + MACADDRPROM + z);
 
         /* print config */
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index e8e9e9194a88..c505b50d1fa3 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -1096,9 +1096,7 @@ static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw)
                 hw_dbg("Configuring Autoneg:PCS_LCTL=0x%08X\n", reg);
         } else {
                 /* Set PCS register for forced link */
-                reg |= E1000_PCS_LCTL_FSD |        /* Force Speed */
-                       E1000_PCS_LCTL_FORCE_LINK | /* Force Link */
-                       E1000_PCS_LCTL_FLV_LINK_UP; /* Force link value up */
+                reg |= E1000_PCS_LCTL_FSD;        /* Force Speed */
 
                 hw_dbg("Configuring Forced Link:PCS_LCTL=0x%08X\n", reg);
         }
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c
index 5c9d73e9bb8d..3670a66401b8 100644
--- a/drivers/net/igb/e1000_phy.c
+++ b/drivers/net/igb/e1000_phy.c
@@ -457,15 +457,6 @@ s32 igb_copper_link_setup_82580(struct e1000_hw *hw)
         phy_data |= I82580_CFG_ENABLE_DOWNSHIFT;
 
         ret_val = phy->ops.write_reg(hw, I82580_CFG_REG, phy_data);
-        if (ret_val)
-                goto out;
-
-        /* Set number of link attempts before downshift */
-        ret_val = phy->ops.read_reg(hw, I82580_CTRL_REG, &phy_data);
-        if (ret_val)
-                goto out;
-        phy_data &= ~I82580_CTRL_DOWNSHIFT_MASK;
-        ret_val = phy->ops.write_reg(hw, I82580_CTRL_REG, phy_data);
 
 out:
         return ret_val;
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index ac9d5272650d..f771a6c08777 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -1795,7 +1795,7 @@ static int igb_wol_exclusion(struct igb_adapter *adapter,
                 /* dual port cards only support WoL on port A from now on
                  * unless it was enabled in the eeprom for port B
                  * so exclude FUNC_1 ports from having WoL enabled */
-                if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1 &&
+                if ((rd32(E1000_STATUS) & E1000_STATUS_FUNC_MASK) &&
                     !adapter->eeprom_wol) {
                         wol->supported = 0;
                         break;
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 78963a0e128d..933c64ff2465 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1306,13 +1306,8 @@ void igb_reset(struct igb_adapter *adapter)
         hwm = min(((pba << 10) * 9 / 10),
                         ((pba << 10) - 2 * adapter->max_frame_size));
 
-        if (mac->type < e1000_82576) {
-                fc->high_water = hwm & 0xFFF8;  /* 8-byte granularity */
-                fc->low_water = fc->high_water - 8;
-        } else {
-                fc->high_water = hwm & 0xFFF0;  /* 16-byte granularity */
-                fc->low_water = fc->high_water - 16;
-        }
+        fc->high_water = hwm & 0xFFF0;  /* 16-byte granularity */
+        fc->low_water = fc->high_water - 16;
         fc->pause_time = 0xFFFF;
         fc->send_xon = 1;
         fc->current_mode = fc->requested_mode;
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index e9dd95f136aa..0dbd0320023a 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -2763,7 +2763,8 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
         err = hw->mac.ops.reset_hw(hw);
         if (err) {
                 dev_info(&pdev->dev,
-                         "PF still in reset state, assigning new address\n");
+                         "PF still in reset state, assigning new address."
+                         " Is the PF interface up?\n");
                 random_ether_addr(hw->mac.addr);
         } else {
                 err = hw->mac.ops.read_mac_addr(hw);
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile
index 21b41f42b61c..bfef0ebcba9a 100644
--- a/drivers/net/ixgbe/Makefile
+++ b/drivers/net/ixgbe/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel 10 Gigabit PCI Express Linux driver
-# Copyright(c) 1999 - 2009 Intel Corporation.
+# Copyright(c) 1999 - 2010 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 8da8eb535084..303e7bd39b67 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index e2d5343f1275..3103f4165311 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -510,6 +510,40 @@ static s32 ixgbe_start_mac_link_82598(struct ixgbe_hw *hw,
 }
 
 /**
+ *  ixgbe_validate_link_ready - Function looks for phy link
+ *  @hw: pointer to hardware structure
+ *
+ *  Function indicates success when phy link is available. If phy is not ready
+ *  within 5 seconds of MAC indicating link, the function returns error.
+ **/
+static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw)
+{
+        u32 timeout;
+        u16 an_reg;
+
+        if (hw->device_id != IXGBE_DEV_ID_82598AT2)
+                return 0;
+
+        for (timeout = 0;
+             timeout < IXGBE_VALIDATE_LINK_READY_TIMEOUT; timeout++) {
+                hw->phy.ops.read_reg(hw, MDIO_STAT1, MDIO_MMD_AN, &an_reg);
+
+                if ((an_reg & MDIO_AN_STAT1_COMPLETE) &&
+                    (an_reg & MDIO_STAT1_LSTATUS))
+                        break;
+
+                msleep(100);
+        }
+
+        if (timeout == IXGBE_VALIDATE_LINK_READY_TIMEOUT) {
+                hw_dbg(hw, "Link was indicated but link is down\n");
+                return IXGBE_ERR_LINK_SETUP;
+        }
+
+        return 0;
+}
+
+/**
  *  ixgbe_check_mac_link_82598 - Get link/speed status
  *  @hw: pointer to hardware structure
  *  @speed: pointer to link speed
@@ -589,6 +623,10 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
         else
                 *speed = IXGBE_LINK_SPEED_1GB_FULL;
 
+        if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) &&
+            (ixgbe_validate_link_ready(hw) != 0))
+                *link_up = false;
+
         /* if link is down, zero out the current_mode */
         if (*link_up == false) {
                 hw->fc.current_mode = ixgbe_fc_none;
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 538340527aa6..b49bd6b9feb7 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 688b8ca5da32..21f158f79dd0 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 27f3214bed2e..dfff0ffaa502 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c
index a1562287342f..9aea4f04bbd2 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ixgbe/ixgbe_dcb.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h
index 64a9fa15c059..5caafd4afbc3 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.h
+++ b/drivers/net/ixgbe/ixgbe_dcb.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/ixgbe_dcb_82598.c
index f30263898ebc..f0e9279d4669 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ixgbe/ixgbe_dcb_82598.h
index ebbe53c352a7..cc728fa092e2 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
index ec8a252636d3..4f7a26ab411e 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ixgbe/ixgbe_dcb_82599.h
index 9e5e2827e4af..0f3f791e1e1d 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index 3c7a79a7d7c6..56f37f66b696 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 0bd49d3b9f65..d77961fc75f9 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index da32a108a7b4..e9a20c88c155 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
index de8ff53187da..abf4b2b3f252 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ixgbe/ixgbe_fcoe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 35ea8c93fd80..9c9202f40b10 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -52,7 +52,7 @@ static const char ixgbe_driver_string[] =
 
 #define DRV_VERSION "2.0.44-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
-static char ixgbe_copyright[] = "Copyright (c) 1999-2009 Intel Corporation.";
+static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
 
 static const struct ixgbe_info *ixgbe_info_tbl[] = {
         [board_82598] = &ixgbe_82598_info,
@@ -262,10 +262,12 @@ static inline bool ixgbe_tx_is_paused(struct ixgbe_adapter *adapter,
                 int reg_idx = tx_ring->reg_idx;
                 int dcb_i = adapter->ring_feature[RING_F_DCB].indices;
 
-                if (adapter->hw.mac.type == ixgbe_mac_82598EB) {
+                switch (adapter->hw.mac.type) {
+                case ixgbe_mac_82598EB:
                         tc = reg_idx >> 2;
                         txoff = IXGBE_TFCS_TXOFF0;
-                } else if (adapter->hw.mac.type == ixgbe_mac_82599EB) {
+                        break;
+                case ixgbe_mac_82599EB:
                         tc = 0;
                         txoff = IXGBE_TFCS_TXOFF;
                         if (dcb_i == 8) {
@@ -284,6 +286,9 @@ static inline bool ixgbe_tx_is_paused(struct ixgbe_adapter *adapter,
                                                 tc += (reg_idx - 96) >> 4;
                                 }
                         }
+                        break;
+                default:
+                        tc = 0;
                 }
                 txoff <<= tc;
         }
@@ -4373,6 +4378,11 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
+        /*
+         * pci_restore_state clears dev->state_saved so call
+         * pci_save_state to restore it.
+         */
+        pci_save_state(pdev);
 
         err = pci_enable_device_mem(pdev);
         if (err) {
@@ -4511,6 +4521,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
         struct ixgbe_hw *hw = &adapter->hw;
         u64 total_mpc = 0;
         u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
+        u64 non_eop_descs = 0, restart_queue = 0;
 
         if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                 u64 rsc_count = 0;
@@ -4528,10 +4539,12 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
 
         /* gather some stats to the adapter struct that are per queue */
         for (i = 0; i < adapter->num_tx_queues; i++)
-                adapter->restart_queue += adapter->tx_ring[i].restart_queue;
+                restart_queue += adapter->tx_ring[i].restart_queue;
+        adapter->restart_queue = restart_queue;
 
         for (i = 0; i < adapter->num_rx_queues; i++)
-                adapter->non_eop_descs += adapter->tx_ring[i].non_eop_descs;
+                non_eop_descs += adapter->rx_ring[i].non_eop_descs;
+        adapter->non_eop_descs = non_eop_descs;
 
         adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
         for (i = 0; i < 8; i++) {
@@ -5003,7 +5016,18 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
                                     IXGBE_ADVTXD_DTYP_CTXT);
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                        switch (skb->protocol) {
+                        __be16 protocol;
+
+                        if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {
+                                const struct vlan_ethhdr *vhdr =
+                                        (const struct vlan_ethhdr *)skb->data;
+
+                                protocol = vhdr->h_vlan_encapsulated_proto;
+                        } else {
+                                protocol = skb->protocol;
+                        }
+
+                        switch (protocol) {
                         case cpu_to_be16(ETH_P_IP):
                                 type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
                                 if (ip_hdr(skb)->protocol == IPPROTO_TCP)
@@ -5552,6 +5576,10 @@ static void ixgbe_netpoll(struct net_device *netdev)
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         int i;
 
+        /* if interface is down do nothing */
+        if (test_bit(__IXGBE_DOWN, &adapter->state))
+                return;
+
         adapter->flags |= IXGBE_FLAG_IN_NETPOLL;
         if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
                 int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
index 9ecad17522c3..1c1efd386956 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ixgbe/ixgbe_phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h
index 9b700f5bf1ed..9cf5f3b4cc5d 100644
--- a/drivers/net/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ixgbe/ixgbe_phy.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index f3e8d52610b7..9eafddfa1b97 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -841,6 +841,8 @@
 #define IXGBE_MPVC      0x04318
 #define IXGBE_SGMIIC    0x04314
 
+#define IXGBE_VALIDATE_LINK_READY_TIMEOUT 50
+
 /* Omer CORECTL */
 #define IXGBE_CORECTL           0x014F00
 /* BARCTRL */
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index 336e7c7a9275..a8522bd73ae7 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -134,7 +134,7 @@ static int temac_dma_bd_init(struct net_device *ndev)
         struct sk_buff *skb;
         int i;
 
-        lp->rx_skb = kzalloc(sizeof(struct sk_buff)*RX_BD_NUM, GFP_KERNEL);
+        lp->rx_skb = kzalloc(sizeof(*lp->rx_skb) * RX_BD_NUM, GFP_KERNEL);
         /* allocate the tx and rx ring buffer descriptors. */
         /* returns a virtual addres and a physical address. */
         lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index ad95d5f7b630..8c8515619b8e 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -72,35 +72,6 @@ void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj)
         mlx4_bitmap_free_range(bitmap, obj, 1);
 }
 
-static unsigned long find_aligned_range(unsigned long *bitmap,
-                                        u32 start, u32 nbits,
-                                        int len, int align)
-{
-        unsigned long end, i;
-
-again:
-        start = ALIGN(start, align);
-
-        while ((start < nbits) && test_bit(start, bitmap))
-                start += align;
-
-        if (start >= nbits)
-                return -1;
-
-        end = start+len;
-        if (end > nbits)
-                return -1;
-
-        for (i = start + 1; i < end; i++) {
-                if (test_bit(i, bitmap)) {
-                        start = i + 1;
-                        goto again;
-                }
-        }
-
-        return start;
-}
-
 u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
 {
         u32 obj, i;
@@ -110,13 +81,13 @@ u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
 
         spin_lock(&bitmap->lock);
 
-        obj = find_aligned_range(bitmap->table, bitmap->last,
-                                 bitmap->max, cnt, align);
+        obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max,
+                                bitmap->last, cnt, align - 1);
         if (obj >= bitmap->max) {
                 bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)
                                 & bitmap->mask;
-                obj = find_aligned_range(bitmap->table, 0, bitmap->max,
-                                         cnt, align);
+                obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max,
+                                                0, cnt, align - 1);
         }
 
         if (obj < bitmap->max) {
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index 3c16602172fc..04f42ae1eda0 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -90,6 +90,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
                 [ 9] = "Q_Key violation counter",
                 [10] = "VMM",
                 [12] = "DPDP",
+                [15] = "Big LSO headers",
                 [16] = "MW support",
                 [17] = "APM support",
                 [18] = "Atomic ops support",
@@ -235,7 +236,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MPT_OFFSET);
         dev_cap->max_mpts = 1 << (field & 0x3f);
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_EQ_OFFSET);
-        dev_cap->reserved_eqs = 1 << (field & 0xf);
+        dev_cap->reserved_eqs = field & 0xf;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_EQ_OFFSET);
         dev_cap->max_eqs = 1 << (field & 0xf);
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET);
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 291a505fd4fc..3cf56d90d859 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1174,7 +1174,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         return 0;
 
 err_port:
-        for (port = 1; port <= dev->caps.num_ports; port++)
+        for (--port; port >= 1; --port)
                 mlx4_cleanup_port_info(&priv->port[port]);
 
         mlx4_cleanup_mcg_table(dev);
diff --git a/drivers/net/mlx4/sense.c b/drivers/net/mlx4/sense.c
index f36ae691cab3..015fbe785c13 100644
--- a/drivers/net/mlx4/sense.c
+++ b/drivers/net/mlx4/sense.c
@@ -53,7 +53,7 @@ static int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,
 
         if (out_param > 2) {
                 mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", out_param);
-                return EINVAL;
+                return -EINVAL;
         }
 
         *type = out_param;
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 1405a170bb43..af67af55efe7 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -656,6 +656,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
                 struct sk_buff *skb;
                 int rx;
                 struct rx_desc *rx_desc;
+                int size;
 
                 skb = __skb_dequeue(&mp->rx_recycle);
                 if (skb == NULL)
@@ -678,10 +679,11 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
 
                 rx_desc = rxq->rx_desc_area + rx;
 
+                size = skb->end - skb->data;
                 rx_desc->buf_ptr = dma_map_single(mp->dev->dev.parent,
-                                                  skb->data, mp->skb_size,
+                                                  skb->data, size,
                                                   DMA_FROM_DEVICE);
-                rx_desc->buf_size = mp->skb_size;
+                rx_desc->buf_size = size;
                 rxq->rx_skb[rx] = skb;
                 wmb();
                 rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT;
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 76cd1f3e9fc8..9bc5bd1d538a 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 65
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.65"
+#define _NETXEN_NIC_LINUX_SUBVERSION 72
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.72"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index ddd704ae0188..542f408333ff 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -66,7 +66,7 @@ static const char netxen_nic_gstrings_test[][ETH_GSTRING_LEN] = {
 
 #define NETXEN_NIC_TEST_LEN     ARRAY_SIZE(netxen_nic_gstrings_test)
 
-#define NETXEN_NIC_REGS_COUNT 42
+#define NETXEN_NIC_REGS_COUNT 30
 #define NETXEN_NIC_REGS_LEN (NETXEN_NIC_REGS_COUNT * sizeof(__le32))
 #define NETXEN_MAX_EEPROM_LEN   1024
 
@@ -312,150 +312,91 @@ static int netxen_nic_get_regs_len(struct net_device *dev)
         return NETXEN_NIC_REGS_LEN;
 }
 
-struct netxen_niu_regs {
-        __u32 reg[NETXEN_NIC_REGS_COUNT];
-};
-
-static struct netxen_niu_regs niu_registers[] = {
-        {
-         /* GB Mode */
-         {
-          NETXEN_NIU_GB_SERDES_RESET,
-          NETXEN_NIU_GB0_MII_MODE,
-          NETXEN_NIU_GB1_MII_MODE,
-          NETXEN_NIU_GB2_MII_MODE,
-          NETXEN_NIU_GB3_MII_MODE,
-          NETXEN_NIU_GB0_GMII_MODE,
-          NETXEN_NIU_GB1_GMII_MODE,
-          NETXEN_NIU_GB2_GMII_MODE,
-          NETXEN_NIU_GB3_GMII_MODE,
-          NETXEN_NIU_REMOTE_LOOPBACK,
-          NETXEN_NIU_GB0_HALF_DUPLEX,
-          NETXEN_NIU_GB1_HALF_DUPLEX,
-          NETXEN_NIU_RESET_SYS_FIFOS,
-          NETXEN_NIU_GB_CRC_DROP,
-          NETXEN_NIU_GB_DROP_WRONGADDR,
-          NETXEN_NIU_TEST_MUX_CTL,
-
-          NETXEN_NIU_GB_MAC_CONFIG_0(0),
-          NETXEN_NIU_GB_MAC_CONFIG_1(0),
-          NETXEN_NIU_GB_HALF_DUPLEX_CTRL(0),
-          NETXEN_NIU_GB_MAX_FRAME_SIZE(0),
-          NETXEN_NIU_GB_TEST_REG(0),
-          NETXEN_NIU_GB_MII_MGMT_CONFIG(0),
-          NETXEN_NIU_GB_MII_MGMT_COMMAND(0),
-          NETXEN_NIU_GB_MII_MGMT_ADDR(0),
-          NETXEN_NIU_GB_MII_MGMT_CTRL(0),
-          NETXEN_NIU_GB_MII_MGMT_STATUS(0),
-          NETXEN_NIU_GB_MII_MGMT_INDICATE(0),
-          NETXEN_NIU_GB_INTERFACE_CTRL(0),
-          NETXEN_NIU_GB_INTERFACE_STATUS(0),
-          NETXEN_NIU_GB_STATION_ADDR_0(0),
-          NETXEN_NIU_GB_STATION_ADDR_1(0),
-          -1,
-          }
-         },
-        {
-         /* XG Mode */
-         {
-          NETXEN_NIU_XG_SINGLE_TERM,
-          NETXEN_NIU_XG_DRIVE_HI,
-          NETXEN_NIU_XG_DRIVE_LO,
-          NETXEN_NIU_XG_DTX,
-          NETXEN_NIU_XG_DEQ,
-          NETXEN_NIU_XG_WORD_ALIGN,
-          NETXEN_NIU_XG_RESET,
-          NETXEN_NIU_XG_POWER_DOWN,
-          NETXEN_NIU_XG_RESET_PLL,
-          NETXEN_NIU_XG_SERDES_LOOPBACK,
-          NETXEN_NIU_XG_DO_BYTE_ALIGN,
-          NETXEN_NIU_XG_TX_ENABLE,
-          NETXEN_NIU_XG_RX_ENABLE,
-          NETXEN_NIU_XG_STATUS,
-          NETXEN_NIU_XG_PAUSE_THRESHOLD,
-          NETXEN_NIU_XGE_CONFIG_0,
-          NETXEN_NIU_XGE_CONFIG_1,
-          NETXEN_NIU_XGE_IPG,
-          NETXEN_NIU_XGE_STATION_ADDR_0_HI,
-          NETXEN_NIU_XGE_STATION_ADDR_0_1,
-          NETXEN_NIU_XGE_STATION_ADDR_1_LO,
-          NETXEN_NIU_XGE_STATUS,
-          NETXEN_NIU_XGE_MAX_FRAME_SIZE,
-          NETXEN_NIU_XGE_PAUSE_FRAME_VALUE,
-          NETXEN_NIU_XGE_TX_BYTE_CNT,
-          NETXEN_NIU_XGE_TX_FRAME_CNT,
-          NETXEN_NIU_XGE_RX_BYTE_CNT,
-          NETXEN_NIU_XGE_RX_FRAME_CNT,
-          NETXEN_NIU_XGE_AGGR_ERROR_CNT,
-          NETXEN_NIU_XGE_MULTICAST_FRAME_CNT,
-          NETXEN_NIU_XGE_UNICAST_FRAME_CNT,
-          NETXEN_NIU_XGE_CRC_ERROR_CNT,
-          NETXEN_NIU_XGE_OVERSIZE_FRAME_ERR,
-          NETXEN_NIU_XGE_UNDERSIZE_FRAME_ERR,
-          NETXEN_NIU_XGE_LOCAL_ERROR_CNT,
-          NETXEN_NIU_XGE_REMOTE_ERROR_CNT,
-          NETXEN_NIU_XGE_CONTROL_CHAR_CNT,
-          NETXEN_NIU_XGE_PAUSE_FRAME_CNT,
-          -1,
-          }
-         }
-};
-
 static void
 netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
 {
         struct netxen_adapter *adapter = netdev_priv(dev);
-        __u32 mode, *regs_buff = p;
-        int i, window;
+        struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
+        struct nx_host_sds_ring *sds_ring;
+        u32 *regs_buff = p;
+        int ring, i = 0;
+        int port = adapter->physical_port;
 
         memset(p, 0, NETXEN_NIC_REGS_LEN);
+
         regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |
             (adapter->pdev)->device;
-        /* which mode */
-        regs_buff[0] = NXRD32(adapter, NETXEN_NIU_MODE);
-        mode = regs_buff[0];
-
-        /* Common registers to all the modes */
-        regs_buff[2] = NXRD32(adapter, NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER);
-        /* GB/XGB Mode */
-        mode = (mode / 2) - 1;
-        window = 0;
-        if (mode <= 1) {
-                for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) {
-                        /* GB: port specific registers */
-                        if (mode == 0 && i >= 19)
-                                window = adapter->physical_port *
-                                        NETXEN_NIC_PORT_WINDOW;
-
-                        regs_buff[i] = NXRD32(adapter,
-                                niu_registers[mode].reg[i - 3] + window);
-                }
 
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                return;
+
+        regs_buff[i++] = NXRD32(adapter, CRB_CMDPEG_STATE);
+        regs_buff[i++] = NXRD32(adapter, CRB_RCVPEG_STATE);
+        regs_buff[i++] = NXRD32(adapter, CRB_FW_CAPABILITIES_1);
+        regs_buff[i++] = NXRDIO(adapter, adapter->crb_int_state_reg);
+        regs_buff[i++] = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
+        regs_buff[i++] = NXRD32(adapter, NX_CRB_DEV_STATE);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_PEG_HALT_STATUS1);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_PEG_HALT_STATUS2);
+
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_0+0x3c);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_1+0x3c);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_2+0x3c);
+        regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_3+0x3c);
+
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+
+                regs_buff[i++] = NXRD32(adapter, NETXEN_CRB_PEG_NET_4+0x3c);
+                i += 2;
+
+                regs_buff[i++] = NXRD32(adapter, CRB_XG_STATE_P3);
+                regs_buff[i++] = le32_to_cpu(*(adapter->tx_ring->hw_consumer));
+
+        } else {
+                i++;
+
+                regs_buff[i++] = NXRD32(adapter,
+                                        NETXEN_NIU_XGE_CONFIG_0+(0x10000*port));
+                regs_buff[i++] = NXRD32(adapter,
+                                        NETXEN_NIU_XGE_CONFIG_1+(0x10000*port));
+
+                regs_buff[i++] = NXRD32(adapter, CRB_XG_STATE);
+                regs_buff[i++] = NXRDIO(adapter,
+                                 adapter->tx_ring->crb_cmd_consumer);
+        }
+
+        regs_buff[i++] = NXRDIO(adapter, adapter->tx_ring->crb_cmd_producer);
+
+        regs_buff[i++] = NXRDIO(adapter,
+                         recv_ctx->rds_rings[0].crb_rcv_producer);
+        regs_buff[i++] = NXRDIO(adapter,
+                         recv_ctx->rds_rings[1].crb_rcv_producer);
+
+        regs_buff[i++] = adapter->max_sds_rings;
+
+        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+                sds_ring = &(recv_ctx->sds_rings[ring]);
+                regs_buff[i++] = NXRDIO(adapter,
+                                        sds_ring->crb_sts_consumer);
         }
 }
 
 static u32 netxen_nic_test_link(struct net_device *dev)
 {
         struct netxen_adapter *adapter = netdev_priv(dev);
-        __u32 status;
-        int val;
+        u32 val, port;
 
-        /* read which mode */
-        if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                if (adapter->phy_read &&
-                    adapter->phy_read(adapter,
-                                      NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                      &status) != 0)
-                        return -EIO;
-                else {
-                        val = netxen_get_phy_link(status);
-                        return !val;
-                }
-        } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
+        port = adapter->physical_port;
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+                val = NXRD32(adapter, CRB_XG_STATE_P3);
+                val = XG_LINK_STATE_P3(adapter->ahw.pci_func, val);
+                return (val == XG_LINK_UP_P3) ? 0 : 1;
+        } else {
                 val = NXRD32(adapter, CRB_XG_STATE);
+                val = (val >> port*8) & 0xff;
                 return (val == XG_LINK_UP) ? 0 : 1;
         }
-        return -EIO;
 }
 
 static int
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 2e364fee3cbb..85e28e60ecf1 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -345,8 +345,7 @@ netxen_pcie_sem_lock(struct netxen_adapter *adapter, int sem, u32 id_reg)
 void
 netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem)
 {
-        int val;
-        val = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem)));
+        NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem)));
 }
 
 int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
@@ -691,6 +690,9 @@ void netxen_p3_nic_set_multi(struct net_device *netdev)
         struct list_head *head;
         nx_mac_list_t *cur;
 
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                return;
+
         list_splice_tail_init(&adapter->mac_list, &del_list);
 
         nx_p3_nic_add_mac(adapter, adapter->mac_addr, &del_list);
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 02f8d4b4db63..64cff68d372c 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -184,6 +184,8 @@ skip_rds:
 
         tx_ring = adapter->tx_ring;
         vfree(tx_ring->cmd_buf_arr);
+        kfree(tx_ring);
+        adapter->tx_ring = NULL;
 }
 
 int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
@@ -782,7 +784,7 @@ netxen_need_fw_reset(struct netxen_adapter *adapter)
         if (NXRD32(adapter, CRB_CMDPEG_STATE) == PHAN_INITIALIZE_FAILED)
                 return 1;
 
-        old_count = count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
+        old_count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
 
         for (i = 0; i < 10; i++) {
 
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index f4996846a234..9f9d6081959b 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -57,7 +57,9 @@ static int use_msi = 1;
 
 static int use_msi_x = 1;
 
-static unsigned long auto_fw_reset = AUTO_FW_RESET_ENABLED;
+static int auto_fw_reset = AUTO_FW_RESET_ENABLED;
+module_param(auto_fw_reset, int, 0644);
+MODULE_PARM_DESC(auto_fw_reset,"Auto firmware reset (0=disabled, 1=enabled");
 
 static int __devinit netxen_nic_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent);
@@ -338,7 +340,7 @@ netxen_check_hw_init(struct netxen_adapter *adapter, int first_boot)
                 if (!(first_boot & 0x4)) {
                         first_boot |= 0x4;
                         NXWR32(adapter, NETXEN_PCIE_REG(0x4), first_boot);
-                        first_boot = NXRD32(adapter, NETXEN_PCIE_REG(0x4));
+                        NXRD32(adapter, NETXEN_PCIE_REG(0x4));
                 }
 
                 /* This is the first boot after power up */
@@ -1896,12 +1898,8 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)
                 linkup = (val == XG_LINK_UP_P3);
         } else {
                 val = NXRD32(adapter, CRB_XG_STATE);
-                if (adapter->ahw.port_type == NETXEN_NIC_GBE)
-                        linkup = (val >> port) & 1;
-                else {
-                        val = (val >> port*8) & 0xff;
-                        linkup = (val == XG_LINK_UP);
-                }
+                val = (val >> port*8) & 0xff;
+                linkup = (val == XG_LINK_UP);
         }
 
         netxen_advert_link_change(adapter, linkup);
@@ -2534,42 +2532,6 @@ static struct bin_attribute bin_attr_mem = {
         .write = netxen_sysfs_write_mem,
 };
 
-#ifdef CONFIG_MODULES
-static ssize_t
-netxen_store_auto_fw_reset(struct module_attribute *mattr,
-                struct module *mod, const char *buf, size_t count)
-
-{
-        unsigned long new;
-
-        if (strict_strtoul(buf, 16, &new))
-                return -EINVAL;
-
-        if ((new == AUTO_FW_RESET_ENABLED) || (new == AUTO_FW_RESET_DISABLED)) {
-                auto_fw_reset = new;
-                return count;
-        }
-
-        return -EINVAL;
-}
-
-static ssize_t
-netxen_show_auto_fw_reset(struct module_attribute *mattr,
-                struct module *mod, char *buf)
-
-{
-        if (auto_fw_reset == AUTO_FW_RESET_ENABLED)
-                return sprintf(buf, "enabled\n");
-        else
-                return sprintf(buf, "disabled\n");
-}
-
-static struct module_attribute mod_attr_fw_reset = {
-        .attr = {.name = "auto_fw_reset", .mode = (S_IRUGO | S_IWUSR)},
-        .show = netxen_show_auto_fw_reset,
-        .store = netxen_store_auto_fw_reset,
-};
-#endif
 
 static void
 netxen_create_sysfs_entries(struct netxen_adapter *adapter)
@@ -2775,23 +2737,12 @@ static struct pci_driver netxen_driver = {
 
 static int __init netxen_init_module(void)
 {
-#ifdef CONFIG_MODULES
-        struct module *mod = THIS_MODULE;
-#endif
-
         printk(KERN_INFO "%s\n", netxen_nic_driver_string);
 
 #ifdef CONFIG_INET
         register_netdevice_notifier(&netxen_netdev_cb);
         register_inetaddr_notifier(&netxen_inetaddr_cb);
 #endif
-
-#ifdef CONFIG_MODULES
-        if (sysfs_create_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr))
-                printk(KERN_ERR "%s: Failed to create auto_fw_reset "
-                                "sysfs entry.", netxen_nic_driver_name);
-#endif
-
         return pci_register_driver(&netxen_driver);
 }
 
@@ -2799,12 +2750,6 @@ module_init(netxen_init_module);
 
 static void __exit netxen_exit_module(void)
 {
-#ifdef CONFIG_MODULES
-        struct module *mod = THIS_MODULE;
-
-        sysfs_remove_file(&mod->mkobj.kobj, &mod_attr_fw_reset.attr);
-#endif
-
         pci_unregister_driver(&netxen_driver);
 
 #ifdef CONFIG_INET
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 8ce58c4c7dd3..2aed2b382c40 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -2844,7 +2844,7 @@ static int tcam_wait_bit(struct niu *np, u64 bit)
                         break;
                 udelay(1);
         }
-        if (limit < 0)
+        if (limit <= 0)
                 return -ENODEV;
 
         return 0;
diff --git a/drivers/net/octeon/Kconfig b/drivers/net/octeon/Kconfig
new file mode 100644
index 000000000000..1e56bbf3f5c0
--- /dev/null
+++ b/drivers/net/octeon/Kconfig
@@ -0,0 +1,10 @@
+config OCTEON_MGMT_ETHERNET
+        tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)"
+        depends on  CPU_CAVIUM_OCTEON
+        select PHYLIB
+        select MDIO_OCTEON
+        default y
+        help
+          This option enables the ethernet driver for the management
+          port on Cavium Networks' Octeon CN57XX, CN56XX, CN55XX,
+          CN54XX, CN52XX, and CN6XXX chips.
diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile
new file mode 100644
index 000000000000..906edecacfd3
--- /dev/null
+++ b/drivers/net/octeon/Makefile
@@ -0,0 +1,2 @@
+
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET)      += octeon_mgmt.o
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c
new file mode 100644
index 000000000000..050538bf155a
--- /dev/null
+++ b/drivers/net/octeon/octeon_mgmt.c
@@ -0,0 +1,1176 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2009 Cavium Networks
+ */
+
+#include <linux/capability.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/if_vlan.h>
+#include <linux/phy.h>
+#include <linux/spinlock.h>
+
+#include <asm/octeon/octeon.h>
+#include <asm/octeon/cvmx-mixx-defs.h>
+#include <asm/octeon/cvmx-agl-defs.h>
+
+#define DRV_NAME "octeon_mgmt"
+#define DRV_VERSION "2.0"
+#define DRV_DESCRIPTION \
+        "Cavium Networks Octeon MII (management) port Network Driver"
+
+#define OCTEON_MGMT_NAPI_WEIGHT 16
+
+/*
+ * Ring sizes that are powers of two allow for more efficient modulo
+ * opertions.
+ */
+#define OCTEON_MGMT_RX_RING_SIZE 512
+#define OCTEON_MGMT_TX_RING_SIZE 128
+
+/* Allow 8 bytes for vlan and FCS. */
+#define OCTEON_MGMT_RX_HEADROOM (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN)
+
+union mgmt_port_ring_entry {
+        u64 d64;
+        struct {
+                u64    reserved_62_63:2;
+                /* Length of the buffer/packet in bytes */
+                u64    len:14;
+                /* For TX, signals that the packet should be timestamped */
+                u64    tstamp:1;
+                /* The RX error code */
+                u64    code:7;
+#define RING_ENTRY_CODE_DONE 0xf
+#define RING_ENTRY_CODE_MORE 0x10
+                /* Physical address of the buffer */
+                u64    addr:40;
+        } s;
+};
+
+struct octeon_mgmt {
+        struct net_device *netdev;
+        int port;
+        int irq;
+        u64 *tx_ring;
+        dma_addr_t tx_ring_handle;
+        unsigned int tx_next;
+        unsigned int tx_next_clean;
+        unsigned int tx_current_fill;
+        /* The tx_list lock also protects the ring related variables */
+        struct sk_buff_head tx_list;
+
+        /* RX variables only touched in napi_poll.  No locking necessary. */
+        u64 *rx_ring;
+        dma_addr_t rx_ring_handle;
+        unsigned int rx_next;
+        unsigned int rx_next_fill;
+        unsigned int rx_current_fill;
+        struct sk_buff_head rx_list;
+
+        spinlock_t lock;
+        unsigned int last_duplex;
+        unsigned int last_link;
+        struct device *dev;
+        struct napi_struct napi;
+        struct tasklet_struct tx_clean_tasklet;
+        struct phy_device *phydev;
+};
+
+static void octeon_mgmt_set_rx_irq(struct octeon_mgmt *p, int enable)
+{
+        int port = p->port;
+        union cvmx_mixx_intena mix_intena;
+        unsigned long flags;
+
+        spin_lock_irqsave(&p->lock, flags);
+        mix_intena.u64 = cvmx_read_csr(CVMX_MIXX_INTENA(port));
+        mix_intena.s.ithena = enable ? 1 : 0;
+        cvmx_write_csr(CVMX_MIXX_INTENA(port), mix_intena.u64);
+        spin_unlock_irqrestore(&p->lock, flags);
+}
+
+static void octeon_mgmt_set_tx_irq(struct octeon_mgmt *p, int enable)
+{
+        int port = p->port;
+        union cvmx_mixx_intena mix_intena;
+        unsigned long flags;
+
+        spin_lock_irqsave(&p->lock, flags);
+        mix_intena.u64 = cvmx_read_csr(CVMX_MIXX_INTENA(port));
+        mix_intena.s.othena = enable ? 1 : 0;
+        cvmx_write_csr(CVMX_MIXX_INTENA(port), mix_intena.u64);
+        spin_unlock_irqrestore(&p->lock, flags);
+}
+
+static inline void octeon_mgmt_enable_rx_irq(struct octeon_mgmt *p)
+{
+        octeon_mgmt_set_rx_irq(p, 1);
+}
+
+static inline void octeon_mgmt_disable_rx_irq(struct octeon_mgmt *p)
+{
+        octeon_mgmt_set_rx_irq(p, 0);
+}
+
+static inline void octeon_mgmt_enable_tx_irq(struct octeon_mgmt *p)
+{
+        octeon_mgmt_set_tx_irq(p, 1);
+}
+
+static inline void octeon_mgmt_disable_tx_irq(struct octeon_mgmt *p)
+{
+        octeon_mgmt_set_tx_irq(p, 0);
+}
+
+static unsigned int ring_max_fill(unsigned int ring_size)
+{
+        return ring_size - 8;
+}
+
+static unsigned int ring_size_to_bytes(unsigned int ring_size)
+{
+        return ring_size * sizeof(union mgmt_port_ring_entry);
+}
+
+static void octeon_mgmt_rx_fill_ring(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+
+        while (p->rx_current_fill < ring_max_fill(OCTEON_MGMT_RX_RING_SIZE)) {
+                unsigned int size;
+                union mgmt_port_ring_entry re;
+                struct sk_buff *skb;
+
+                /* CN56XX pass 1 needs 8 bytes of padding.  */
+                size = netdev->mtu + OCTEON_MGMT_RX_HEADROOM + 8 + NET_IP_ALIGN;
+
+                skb = netdev_alloc_skb(netdev, size);
+                if (!skb)
+                        break;
+                skb_reserve(skb, NET_IP_ALIGN);
+                __skb_queue_tail(&p->rx_list, skb);
+
+                re.d64 = 0;
+                re.s.len = size;
+                re.s.addr = dma_map_single(p->dev, skb->data,
+                                           size,
+                                           DMA_FROM_DEVICE);
+
+                /* Put it in the ring.  */
+                p->rx_ring[p->rx_next_fill] = re.d64;
+                dma_sync_single_for_device(p->dev, p->rx_ring_handle,
+                                           ring_size_to_bytes(OCTEON_MGMT_RX_RING_SIZE),
+                                           DMA_BIDIRECTIONAL);
+                p->rx_next_fill =
+                        (p->rx_next_fill + 1) % OCTEON_MGMT_RX_RING_SIZE;
+                p->rx_current_fill++;
+                /* Ring the bell.  */
+                cvmx_write_csr(CVMX_MIXX_IRING2(port), 1);
+        }
+}
+
+static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)
+{
+        int port = p->port;
+        union cvmx_mixx_orcnt mix_orcnt;
+        union mgmt_port_ring_entry re;
+        struct sk_buff *skb;
+        int cleaned = 0;
+        unsigned long flags;
+
+        mix_orcnt.u64 = cvmx_read_csr(CVMX_MIXX_ORCNT(port));
+        while (mix_orcnt.s.orcnt) {
+                dma_sync_single_for_cpu(p->dev, p->tx_ring_handle,
+                                        ring_size_to_bytes(OCTEON_MGMT_TX_RING_SIZE),
+                                        DMA_BIDIRECTIONAL);
+
+                spin_lock_irqsave(&p->tx_list.lock, flags);
+
+                re.d64 = p->tx_ring[p->tx_next_clean];
+                p->tx_next_clean =
+                        (p->tx_next_clean + 1) % OCTEON_MGMT_TX_RING_SIZE;
+                skb = __skb_dequeue(&p->tx_list);
+
+                mix_orcnt.u64 = 0;
+                mix_orcnt.s.orcnt = 1;
+
+                /* Acknowledge to hardware that we have the buffer.  */
+                cvmx_write_csr(CVMX_MIXX_ORCNT(port), mix_orcnt.u64);
+                p->tx_current_fill--;
+
+                spin_unlock_irqrestore(&p->tx_list.lock, flags);
+
+                dma_unmap_single(p->dev, re.s.addr, re.s.len,
+                                 DMA_TO_DEVICE);
+                dev_kfree_skb_any(skb);
+                cleaned++;
+
+                mix_orcnt.u64 = cvmx_read_csr(CVMX_MIXX_ORCNT(port));
+        }
+
+        if (cleaned && netif_queue_stopped(p->netdev))
+                netif_wake_queue(p->netdev);
+}
+
+static void octeon_mgmt_clean_tx_tasklet(unsigned long arg)
+{
+        struct octeon_mgmt *p = (struct octeon_mgmt *)arg;
+        octeon_mgmt_clean_tx_buffers(p);
+        octeon_mgmt_enable_tx_irq(p);
+}
+
+static void octeon_mgmt_update_rx_stats(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        unsigned long flags;
+        u64 drop, bad;
+
+        /* These reads also clear the count registers.  */
+        drop = cvmx_read_csr(CVMX_AGL_GMX_RXX_STATS_PKTS_DRP(port));
+        bad = cvmx_read_csr(CVMX_AGL_GMX_RXX_STATS_PKTS_BAD(port));
+
+        if (drop || bad) {
+                /* Do an atomic update. */
+                spin_lock_irqsave(&p->lock, flags);
+                netdev->stats.rx_errors += bad;
+                netdev->stats.rx_dropped += drop;
+                spin_unlock_irqrestore(&p->lock, flags);
+        }
+}
+
+static void octeon_mgmt_update_tx_stats(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        unsigned long flags;
+
+        union cvmx_agl_gmx_txx_stat0 s0;
+        union cvmx_agl_gmx_txx_stat1 s1;
+
+        /* These reads also clear the count registers.  */
+        s0.u64 = cvmx_read_csr(CVMX_AGL_GMX_TXX_STAT0(port));
+        s1.u64 = cvmx_read_csr(CVMX_AGL_GMX_TXX_STAT1(port));
+
+        if (s0.s.xsdef || s0.s.xscol || s1.s.scol || s1.s.mcol) {
+                /* Do an atomic update. */
+                spin_lock_irqsave(&p->lock, flags);
+                netdev->stats.tx_errors += s0.s.xsdef + s0.s.xscol;
+                netdev->stats.collisions += s1.s.scol + s1.s.mcol;
+                spin_unlock_irqrestore(&p->lock, flags);
+        }
+}
+
+/*
+ * Dequeue a receive skb and its corresponding ring entry.  The ring
+ * entry is returned, *pskb is updated to point to the skb.
+ */
+static u64 octeon_mgmt_dequeue_rx_buffer(struct octeon_mgmt *p,
+                                         struct sk_buff **pskb)
+{
+        union mgmt_port_ring_entry re;
+
+        dma_sync_single_for_cpu(p->dev, p->rx_ring_handle,
+                                ring_size_to_bytes(OCTEON_MGMT_RX_RING_SIZE),
+                                DMA_BIDIRECTIONAL);
+
+        re.d64 = p->rx_ring[p->rx_next];
+        p->rx_next = (p->rx_next + 1) % OCTEON_MGMT_RX_RING_SIZE;
+        p->rx_current_fill--;
+        *pskb = __skb_dequeue(&p->rx_list);
+
+        dma_unmap_single(p->dev, re.s.addr,
+                         ETH_FRAME_LEN + OCTEON_MGMT_RX_HEADROOM,
+                         DMA_FROM_DEVICE);
+
+        return re.d64;
+}
+
+
+static int octeon_mgmt_receive_one(struct octeon_mgmt *p)
+{
+        int port = p->port;
+        struct net_device *netdev = p->netdev;
+        union cvmx_mixx_ircnt mix_ircnt;
+        union mgmt_port_ring_entry re;
+        struct sk_buff *skb;
+        struct sk_buff *skb2;
+        struct sk_buff *skb_new;
+        union mgmt_port_ring_entry re2;
+        int rc = 1;
+
+
+        re.d64 = octeon_mgmt_dequeue_rx_buffer(p, &skb);
+        if (likely(re.s.code == RING_ENTRY_CODE_DONE)) {
+                /* A good packet, send it up. */
+                skb_put(skb, re.s.len);
+good:
+                skb->protocol = eth_type_trans(skb, netdev);
+                netdev->stats.rx_packets++;
+                netdev->stats.rx_bytes += skb->len;
+                netdev->last_rx = jiffies;
+                netif_receive_skb(skb);
+                rc = 0;
+        } else if (re.s.code == RING_ENTRY_CODE_MORE) {
+                /*
+                 * Packet split across skbs.  This can happen if we
+                 * increase the MTU.  Buffers that are already in the
+                 * rx ring can then end up being too small.  As the rx
+                 * ring is refilled, buffers sized for the new MTU
+                 * will be used and we should go back to the normal
+                 * non-split case.
+                 */
+                skb_put(skb, re.s.len);
+                do {
+                        re2.d64 = octeon_mgmt_dequeue_rx_buffer(p, &skb2);
+                        if (re2.s.code != RING_ENTRY_CODE_MORE
+                                && re2.s.code != RING_ENTRY_CODE_DONE)
+                                goto split_error;
+                        skb_put(skb2,  re2.s.len);
+                        skb_new = skb_copy_expand(skb, 0, skb2->len,
+                                                  GFP_ATOMIC);
+                        if (!skb_new)
+                                goto split_error;
+                        if (skb_copy_bits(skb2, 0, skb_tail_pointer(skb_new),
+                                          skb2->len))
+                                goto split_error;
+                        skb_put(skb_new, skb2->len);
+                        dev_kfree_skb_any(skb);
+                        dev_kfree_skb_any(skb2);
+                        skb = skb_new;
+                } while (re2.s.code == RING_ENTRY_CODE_MORE);
+                goto good;
+        } else {
+                /* Some other error, discard it. */
+                dev_kfree_skb_any(skb);
+                /*
+                 * Error statistics are accumulated in
+                 * octeon_mgmt_update_rx_stats.
+                 */
+        }
+        goto done;
+split_error:
+        /* Discard the whole mess. */
+        dev_kfree_skb_any(skb);
+        dev_kfree_skb_any(skb2);
+        while (re2.s.code == RING_ENTRY_CODE_MORE) {
+                re2.d64 = octeon_mgmt_dequeue_rx_buffer(p, &skb2);
+                dev_kfree_skb_any(skb2);
+        }
+        netdev->stats.rx_errors++;
+
+done:
+        /* Tell the hardware we processed a packet.  */
+        mix_ircnt.u64 = 0;
+        mix_ircnt.s.ircnt = 1;
+        cvmx_write_csr(CVMX_MIXX_IRCNT(port), mix_ircnt.u64);
+        return rc;
+
+}
+
+static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget)
+{
+        int port = p->port;
+        unsigned int work_done = 0;
+        union cvmx_mixx_ircnt mix_ircnt;
+        int rc;
+
+
+        mix_ircnt.u64 = cvmx_read_csr(CVMX_MIXX_IRCNT(port));
+        while (work_done < budget && mix_ircnt.s.ircnt) {
+
+                rc = octeon_mgmt_receive_one(p);
+                if (!rc)
+                        work_done++;
+
+                /* Check for more packets. */
+                mix_ircnt.u64 = cvmx_read_csr(CVMX_MIXX_IRCNT(port));
+        }
+
+        octeon_mgmt_rx_fill_ring(p->netdev);
+
+        return work_done;
+}
+
+static int octeon_mgmt_napi_poll(struct napi_struct *napi, int budget)
+{
+        struct octeon_mgmt *p = container_of(napi, struct octeon_mgmt, napi);
+        struct net_device *netdev = p->netdev;
+        unsigned int work_done = 0;
+
+        work_done = octeon_mgmt_receive_packets(p, budget);
+
+        if (work_done < budget) {
+                /* We stopped because no more packets were available. */
+                napi_complete(napi);
+                octeon_mgmt_enable_rx_irq(p);
+        }
+        octeon_mgmt_update_rx_stats(netdev);
+
+        return work_done;
+}
+
+/* Reset the hardware to clean state.  */
+static void octeon_mgmt_reset_hw(struct octeon_mgmt *p)
+{
+        union cvmx_mixx_ctl mix_ctl;
+        union cvmx_mixx_bist mix_bist;
+        union cvmx_agl_gmx_bist agl_gmx_bist;
+
+        mix_ctl.u64 = 0;
+        cvmx_write_csr(CVMX_MIXX_CTL(p->port), mix_ctl.u64);
+        do {
+                mix_ctl.u64 = cvmx_read_csr(CVMX_MIXX_CTL(p->port));
+        } while (mix_ctl.s.busy);
+        mix_ctl.s.reset = 1;
+        cvmx_write_csr(CVMX_MIXX_CTL(p->port), mix_ctl.u64);
+        cvmx_read_csr(CVMX_MIXX_CTL(p->port));
+        cvmx_wait(64);
+
+        mix_bist.u64 = cvmx_read_csr(CVMX_MIXX_BIST(p->port));
+        if (mix_bist.u64)
+                dev_warn(p->dev, "MIX failed BIST (0x%016llx)\n",
+                        (unsigned long long)mix_bist.u64);
+
+        agl_gmx_bist.u64 = cvmx_read_csr(CVMX_AGL_GMX_BIST);
+        if (agl_gmx_bist.u64)
+                dev_warn(p->dev, "AGL failed BIST (0x%016llx)\n",
+                         (unsigned long long)agl_gmx_bist.u64);
+}
+
+struct octeon_mgmt_cam_state {
+        u64 cam[6];
+        u64 cam_mask;
+        int cam_index;
+};
+
+static void octeon_mgmt_cam_state_add(struct octeon_mgmt_cam_state *cs,
+                                      unsigned char *addr)
+{
+        int i;
+
+        for (i = 0; i < 6; i++)
+                cs->cam[i] |= (u64)addr[i] << (8 * (cs->cam_index));
+        cs->cam_mask |= (1ULL << cs->cam_index);
+        cs->cam_index++;
+}
+
+static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        int i;
+        union cvmx_agl_gmx_rxx_adr_ctl adr_ctl;
+        union cvmx_agl_gmx_prtx_cfg agl_gmx_prtx;
+        unsigned long flags;
+        unsigned int prev_packet_enable;
+        unsigned int cam_mode = 1; /* 1 - Accept on CAM match */
+        unsigned int multicast_mode = 1; /* 1 - Reject all multicast.  */
+        struct octeon_mgmt_cam_state cam_state;
+        struct dev_addr_list *list;
+        struct list_head *pos;
+        int available_cam_entries;
+
+        memset(&cam_state, 0, sizeof(cam_state));
+
+        if ((netdev->flags & IFF_PROMISC) || netdev->dev_addrs.count > 7) {
+                cam_mode = 0;
+                available_cam_entries = 8;
+        } else {
+                /*
+                 * One CAM entry for the primary address, leaves seven
+                 * for the secondary addresses.
+                 */
+                available_cam_entries = 7 - netdev->dev_addrs.count;
+        }
+
+        if (netdev->flags & IFF_MULTICAST) {
+                if (cam_mode == 0 || (netdev->flags & IFF_ALLMULTI)
+                    || netdev->mc_count  > available_cam_entries)
+                        multicast_mode = 2; /* 1 - Accept all multicast.  */
+                else
+                        multicast_mode = 0; /* 0 - Use CAM.  */
+        }
+
+        if (cam_mode == 1) {
+                /* Add primary address. */
+                octeon_mgmt_cam_state_add(&cam_state, netdev->dev_addr);
+                list_for_each(pos, &netdev->dev_addrs.list) {
+                        struct netdev_hw_addr *hw_addr;
+                        hw_addr = list_entry(pos, struct netdev_hw_addr, list);
+                        octeon_mgmt_cam_state_add(&cam_state, hw_addr->addr);
+                        list = list->next;
+                }
+        }
+        if (multicast_mode == 0) {
+                i = netdev->mc_count;
+                list = netdev->mc_list;
+                while (i--) {
+                        octeon_mgmt_cam_state_add(&cam_state, list->da_addr);
+                        list = list->next;
+                }
+        }
+
+
+        spin_lock_irqsave(&p->lock, flags);
+
+        /* Disable packet I/O. */
+        agl_gmx_prtx.u64 = cvmx_read_csr(CVMX_AGL_GMX_PRTX_CFG(port));
+        prev_packet_enable = agl_gmx_prtx.s.en;
+        agl_gmx_prtx.s.en = 0;
+        cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), agl_gmx_prtx.u64);
+
+
+        adr_ctl.u64 = 0;
+        adr_ctl.s.cam_mode = cam_mode;
+        adr_ctl.s.mcst = multicast_mode;
+        adr_ctl.s.bcst = 1;     /* Allow broadcast */
+
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CTL(port), adr_ctl.u64);
+
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CAM0(port), cam_state.cam[0]);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CAM1(port), cam_state.cam[1]);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CAM2(port), cam_state.cam[2]);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CAM3(port), cam_state.cam[3]);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CAM4(port), cam_state.cam[4]);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CAM5(port), cam_state.cam[5]);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_ADR_CAM_EN(port), cam_state.cam_mask);
+
+        /* Restore packet I/O. */
+        agl_gmx_prtx.s.en = prev_packet_enable;
+        cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), agl_gmx_prtx.u64);
+
+        spin_unlock_irqrestore(&p->lock, flags);
+}
+
+static int octeon_mgmt_set_mac_address(struct net_device *netdev, void *addr)
+{
+        struct sockaddr *sa = addr;
+
+        if (!is_valid_ether_addr(sa->sa_data))
+                return -EADDRNOTAVAIL;
+
+        memcpy(netdev->dev_addr, sa->sa_data, ETH_ALEN);
+
+        octeon_mgmt_set_rx_filtering(netdev);
+
+        return 0;
+}
+
+static int octeon_mgmt_change_mtu(struct net_device *netdev, int new_mtu)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        int size_without_fcs = new_mtu + OCTEON_MGMT_RX_HEADROOM;
+
+        /*
+         * Limit the MTU to make sure the ethernet packets are between
+         * 64 bytes and 16383 bytes.
+         */
+        if (size_without_fcs < 64 || size_without_fcs > 16383) {
+                dev_warn(p->dev, "MTU must be between %d and %d.\n",
+                         64 - OCTEON_MGMT_RX_HEADROOM,
+                         16383 - OCTEON_MGMT_RX_HEADROOM);
+                return -EINVAL;
+        }
+
+        netdev->mtu = new_mtu;
+
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_FRM_MAX(port), size_without_fcs);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_JABBER(port),
+                       (size_without_fcs + 7) & 0xfff8);
+
+        return 0;
+}
+
+static irqreturn_t octeon_mgmt_interrupt(int cpl, void *dev_id)
+{
+        struct net_device *netdev = dev_id;
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        union cvmx_mixx_isr mixx_isr;
+
+        mixx_isr.u64 = cvmx_read_csr(CVMX_MIXX_ISR(port));
+
+        /* Clear any pending interrupts */
+        cvmx_write_csr(CVMX_MIXX_ISR(port),
+                       cvmx_read_csr(CVMX_MIXX_ISR(port)));
+        cvmx_read_csr(CVMX_MIXX_ISR(port));
+
+        if (mixx_isr.s.irthresh) {
+                octeon_mgmt_disable_rx_irq(p);
+                napi_schedule(&p->napi);
+        }
+        if (mixx_isr.s.orthresh) {
+                octeon_mgmt_disable_tx_irq(p);
+                tasklet_schedule(&p->tx_clean_tasklet);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int octeon_mgmt_ioctl(struct net_device *netdev,
+                             struct ifreq *rq, int cmd)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+
+        if (!netif_running(netdev))
+                return -EINVAL;
+
+        if (!p->phydev)
+                return -EINVAL;
+
+        return phy_mii_ioctl(p->phydev, if_mii(rq), cmd);
+}
+
+static void octeon_mgmt_adjust_link(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        union cvmx_agl_gmx_prtx_cfg prtx_cfg;
+        unsigned long flags;
+        int link_changed = 0;
+
+        spin_lock_irqsave(&p->lock, flags);
+        if (p->phydev->link) {
+                if (!p->last_link)
+                        link_changed = 1;
+                if (p->last_duplex != p->phydev->duplex) {
+                        p->last_duplex = p->phydev->duplex;
+                        prtx_cfg.u64 =
+                                cvmx_read_csr(CVMX_AGL_GMX_PRTX_CFG(port));
+                        prtx_cfg.s.duplex = p->phydev->duplex;
+                        cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port),
+                                       prtx_cfg.u64);
+                }
+        } else {
+                if (p->last_link)
+                        link_changed = -1;
+        }
+        p->last_link = p->phydev->link;
+        spin_unlock_irqrestore(&p->lock, flags);
+
+        if (link_changed != 0) {
+                if (link_changed > 0) {
+                        netif_carrier_on(netdev);
+                        pr_info("%s: Link is up - %d/%s\n", netdev->name,
+                                p->phydev->speed,
+                                DUPLEX_FULL == p->phydev->duplex ?
+                                "Full" : "Half");
+                } else {
+                        netif_carrier_off(netdev);
+                        pr_info("%s: Link is down\n", netdev->name);
+                }
+        }
+}
+
+static int octeon_mgmt_init_phy(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        char phy_id[20];
+
+        if (octeon_is_simulation()) {
+                /* No PHYs in the simulator. */
+                netif_carrier_on(netdev);
+                return 0;
+        }
+
+        snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "0", p->port);
+
+        p->phydev = phy_connect(netdev, phy_id, octeon_mgmt_adjust_link, 0,
+                                PHY_INTERFACE_MODE_MII);
+
+        if (IS_ERR(p->phydev)) {
+                p->phydev = NULL;
+                return -1;
+        }
+
+        phy_start_aneg(p->phydev);
+
+        return 0;
+}
+
+static int octeon_mgmt_open(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        union cvmx_mixx_ctl mix_ctl;
+        union cvmx_agl_gmx_inf_mode agl_gmx_inf_mode;
+        union cvmx_mixx_oring1 oring1;
+        union cvmx_mixx_iring1 iring1;
+        union cvmx_agl_gmx_prtx_cfg prtx_cfg;
+        union cvmx_agl_gmx_rxx_frm_ctl rxx_frm_ctl;
+        union cvmx_mixx_irhwm mix_irhwm;
+        union cvmx_mixx_orhwm mix_orhwm;
+        union cvmx_mixx_intena mix_intena;
+        struct sockaddr sa;
+
+        /* Allocate ring buffers.  */
+        p->tx_ring = kzalloc(ring_size_to_bytes(OCTEON_MGMT_TX_RING_SIZE),
+                             GFP_KERNEL);
+        if (!p->tx_ring)
+                return -ENOMEM;
+        p->tx_ring_handle =
+                dma_map_single(p->dev, p->tx_ring,
+                               ring_size_to_bytes(OCTEON_MGMT_TX_RING_SIZE),
+                               DMA_BIDIRECTIONAL);
+        p->tx_next = 0;
+        p->tx_next_clean = 0;
+        p->tx_current_fill = 0;
+
+
+        p->rx_ring = kzalloc(ring_size_to_bytes(OCTEON_MGMT_RX_RING_SIZE),
+                             GFP_KERNEL);
+        if (!p->rx_ring)
+                goto err_nomem;
+        p->rx_ring_handle =
+                dma_map_single(p->dev, p->rx_ring,
+                               ring_size_to_bytes(OCTEON_MGMT_RX_RING_SIZE),
+                               DMA_BIDIRECTIONAL);
+
+        p->rx_next = 0;
+        p->rx_next_fill = 0;
+        p->rx_current_fill = 0;
+
+        octeon_mgmt_reset_hw(p);
+
+        mix_ctl.u64 = cvmx_read_csr(CVMX_MIXX_CTL(port));
+
+        /* Bring it out of reset if needed. */
+        if (mix_ctl.s.reset) {
+                mix_ctl.s.reset = 0;
+                cvmx_write_csr(CVMX_MIXX_CTL(port), mix_ctl.u64);
+                do {
+                        mix_ctl.u64 = cvmx_read_csr(CVMX_MIXX_CTL(port));
+                } while (mix_ctl.s.reset);
+        }
+
+        agl_gmx_inf_mode.u64 = 0;
+        agl_gmx_inf_mode.s.en = 1;
+        cvmx_write_csr(CVMX_AGL_GMX_INF_MODE, agl_gmx_inf_mode.u64);
+
+        oring1.u64 = 0;
+        oring1.s.obase = p->tx_ring_handle >> 3;
+        oring1.s.osize = OCTEON_MGMT_TX_RING_SIZE;
+        cvmx_write_csr(CVMX_MIXX_ORING1(port), oring1.u64);
+
+        iring1.u64 = 0;
+        iring1.s.ibase = p->rx_ring_handle >> 3;
+        iring1.s.isize = OCTEON_MGMT_RX_RING_SIZE;
+        cvmx_write_csr(CVMX_MIXX_IRING1(port), iring1.u64);
+
+        /* Disable packet I/O. */
+        prtx_cfg.u64 = cvmx_read_csr(CVMX_AGL_GMX_PRTX_CFG(port));
+        prtx_cfg.s.en = 0;
+        cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), prtx_cfg.u64);
+
+        memcpy(sa.sa_data, netdev->dev_addr, ETH_ALEN);
+        octeon_mgmt_set_mac_address(netdev, &sa);
+
+        octeon_mgmt_change_mtu(netdev, netdev->mtu);
+
+        /*
+         * Enable the port HW. Packets are not allowed until
+         * cvmx_mgmt_port_enable() is called.
+         */
+        mix_ctl.u64 = 0;
+        mix_ctl.s.crc_strip = 1;    /* Strip the ending CRC */
+        mix_ctl.s.en = 1;           /* Enable the port */
+        mix_ctl.s.nbtarb = 0;       /* Arbitration mode */
+        /* MII CB-request FIFO programmable high watermark */
+        mix_ctl.s.mrq_hwm = 1;
+        cvmx_write_csr(CVMX_MIXX_CTL(port), mix_ctl.u64);
+
+        if (OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)
+            || OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X)) {
+                /*
+                 * Force compensation values, as they are not
+                 * determined properly by HW
+                 */
+                union cvmx_agl_gmx_drv_ctl drv_ctl;
+
+                drv_ctl.u64 = cvmx_read_csr(CVMX_AGL_GMX_DRV_CTL);
+                if (port) {
+                        drv_ctl.s.byp_en1 = 1;
+                        drv_ctl.s.nctl1 = 6;
+                        drv_ctl.s.pctl1 = 6;
+                } else {
+                        drv_ctl.s.byp_en = 1;
+                        drv_ctl.s.nctl = 6;
+                        drv_ctl.s.pctl = 6;
+                }
+                cvmx_write_csr(CVMX_AGL_GMX_DRV_CTL, drv_ctl.u64);
+        }
+
+        octeon_mgmt_rx_fill_ring(netdev);
+
+        /* Clear statistics. */
+        /* Clear on read. */
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_STATS_CTL(port), 1);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_STATS_PKTS_DRP(port), 0);
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_STATS_PKTS_BAD(port), 0);
+
+        cvmx_write_csr(CVMX_AGL_GMX_TXX_STATS_CTL(port), 1);
+        cvmx_write_csr(CVMX_AGL_GMX_TXX_STAT0(port), 0);
+        cvmx_write_csr(CVMX_AGL_GMX_TXX_STAT1(port), 0);
+
+        /* Clear any pending interrupts */
+        cvmx_write_csr(CVMX_MIXX_ISR(port), cvmx_read_csr(CVMX_MIXX_ISR(port)));
+
+        if (request_irq(p->irq, octeon_mgmt_interrupt, 0, netdev->name,
+                        netdev)) {
+                dev_err(p->dev, "request_irq(%d) failed.\n", p->irq);
+                goto err_noirq;
+        }
+
+        /* Interrupt every single RX packet */
+        mix_irhwm.u64 = 0;
+        mix_irhwm.s.irhwm = 0;
+        cvmx_write_csr(CVMX_MIXX_IRHWM(port), mix_irhwm.u64);
+
+        /* Interrupt when we have 5 or more packets to clean.  */
+        mix_orhwm.u64 = 0;
+        mix_orhwm.s.orhwm = 5;
+        cvmx_write_csr(CVMX_MIXX_ORHWM(port), mix_orhwm.u64);
+
+        /* Enable receive and transmit interrupts */
+        mix_intena.u64 = 0;
+        mix_intena.s.ithena = 1;
+        mix_intena.s.othena = 1;
+        cvmx_write_csr(CVMX_MIXX_INTENA(port), mix_intena.u64);
+
+
+        /* Enable packet I/O. */
+
+        rxx_frm_ctl.u64 = 0;
+        rxx_frm_ctl.s.pre_align = 1;
+        /*
+         * When set, disables the length check for non-min sized pkts
+         * with padding in the client data.
+         */
+        rxx_frm_ctl.s.pad_len = 1;
+        /* When set, disables the length check for VLAN pkts */
+        rxx_frm_ctl.s.vlan_len = 1;
+        /* When set, PREAMBLE checking is  less strict */
+        rxx_frm_ctl.s.pre_free = 1;
+        /* Control Pause Frames can match station SMAC */
+        rxx_frm_ctl.s.ctl_smac = 0;
+        /* Control Pause Frames can match globally assign Multicast address */
+        rxx_frm_ctl.s.ctl_mcst = 1;
+        /* Forward pause information to TX block */
+        rxx_frm_ctl.s.ctl_bck = 1;
+        /* Drop Control Pause Frames */
+        rxx_frm_ctl.s.ctl_drp = 1;
+        /* Strip off the preamble */
+        rxx_frm_ctl.s.pre_strp = 1;
+        /*
+         * This port is configured to send PREAMBLE+SFD to begin every
+         * frame.  GMX checks that the PREAMBLE is sent correctly.
+         */
+        rxx_frm_ctl.s.pre_chk = 1;
+        cvmx_write_csr(CVMX_AGL_GMX_RXX_FRM_CTL(port), rxx_frm_ctl.u64);
+
+        /* Enable the AGL block */
+        agl_gmx_inf_mode.u64 = 0;
+        agl_gmx_inf_mode.s.en = 1;
+        cvmx_write_csr(CVMX_AGL_GMX_INF_MODE, agl_gmx_inf_mode.u64);
+
+        /* Configure the port duplex and enables */
+        prtx_cfg.u64 = cvmx_read_csr(CVMX_AGL_GMX_PRTX_CFG(port));
+        prtx_cfg.s.tx_en = 1;
+        prtx_cfg.s.rx_en = 1;
+        prtx_cfg.s.en = 1;
+        p->last_duplex = 1;
+        prtx_cfg.s.duplex = p->last_duplex;
+        cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), prtx_cfg.u64);
+
+        p->last_link = 0;
+        netif_carrier_off(netdev);
+
+        if (octeon_mgmt_init_phy(netdev)) {
+                dev_err(p->dev, "Cannot initialize PHY.\n");
+                goto err_noirq;
+        }
+
+        netif_wake_queue(netdev);
+        napi_enable(&p->napi);
+
+        return 0;
+err_noirq:
+        octeon_mgmt_reset_hw(p);
+        dma_unmap_single(p->dev, p->rx_ring_handle,
+                         ring_size_to_bytes(OCTEON_MGMT_RX_RING_SIZE),
+                         DMA_BIDIRECTIONAL);
+        kfree(p->rx_ring);
+err_nomem:
+        dma_unmap_single(p->dev, p->tx_ring_handle,
+                         ring_size_to_bytes(OCTEON_MGMT_TX_RING_SIZE),
+                         DMA_BIDIRECTIONAL);
+        kfree(p->tx_ring);
+        return -ENOMEM;
+}
+
+static int octeon_mgmt_stop(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+
+        napi_disable(&p->napi);
+        netif_stop_queue(netdev);
+
+        if (p->phydev)
+                phy_disconnect(p->phydev);
+
+        netif_carrier_off(netdev);
+
+        octeon_mgmt_reset_hw(p);
+
+
+        free_irq(p->irq, netdev);
+
+        /* dma_unmap is a nop on Octeon, so just free everything.  */
+        skb_queue_purge(&p->tx_list);
+        skb_queue_purge(&p->rx_list);
+
+        dma_unmap_single(p->dev, p->rx_ring_handle,
+                         ring_size_to_bytes(OCTEON_MGMT_RX_RING_SIZE),
+                         DMA_BIDIRECTIONAL);
+        kfree(p->rx_ring);
+
+        dma_unmap_single(p->dev, p->tx_ring_handle,
+                         ring_size_to_bytes(OCTEON_MGMT_TX_RING_SIZE),
+                         DMA_BIDIRECTIONAL);
+        kfree(p->tx_ring);
+
+
+        return 0;
+}
+
+static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        int port = p->port;
+        union mgmt_port_ring_entry re;
+        unsigned long flags;
+
+        re.d64 = 0;
+        re.s.len = skb->len;
+        re.s.addr = dma_map_single(p->dev, skb->data,
+                                   skb->len,
+                                   DMA_TO_DEVICE);
+
+        spin_lock_irqsave(&p->tx_list.lock, flags);
+
+        if (unlikely(p->tx_current_fill >=
+                     ring_max_fill(OCTEON_MGMT_TX_RING_SIZE))) {
+                spin_unlock_irqrestore(&p->tx_list.lock, flags);
+
+                dma_unmap_single(p->dev, re.s.addr, re.s.len,
+                                 DMA_TO_DEVICE);
+
+                netif_stop_queue(netdev);
+                return NETDEV_TX_BUSY;
+        }
+
+        __skb_queue_tail(&p->tx_list, skb);
+
+        /* Put it in the ring.  */
+        p->tx_ring[p->tx_next] = re.d64;
+        p->tx_next = (p->tx_next + 1) % OCTEON_MGMT_TX_RING_SIZE;
+        p->tx_current_fill++;
+
+        spin_unlock_irqrestore(&p->tx_list.lock, flags);
+
+        dma_sync_single_for_device(p->dev, p->tx_ring_handle,
+                                   ring_size_to_bytes(OCTEON_MGMT_TX_RING_SIZE),
+                                   DMA_BIDIRECTIONAL);
+
+        netdev->stats.tx_packets++;
+        netdev->stats.tx_bytes += skb->len;
+
+        /* Ring the bell.  */
+        cvmx_write_csr(CVMX_MIXX_ORING2(port), 1);
+
+        netdev->trans_start = jiffies;
+        octeon_mgmt_clean_tx_buffers(p);
+        octeon_mgmt_update_tx_stats(netdev);
+        return NETDEV_TX_OK;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void octeon_mgmt_poll_controller(struct net_device *netdev)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+
+        octeon_mgmt_receive_packets(p, 16);
+        octeon_mgmt_update_rx_stats(netdev);
+        return;
+}
+#endif
+
+static void octeon_mgmt_get_drvinfo(struct net_device *netdev,
+                                    struct ethtool_drvinfo *info)
+{
+        strncpy(info->driver, DRV_NAME, sizeof(info->driver));
+        strncpy(info->version, DRV_VERSION, sizeof(info->version));
+        strncpy(info->fw_version, "N/A", sizeof(info->fw_version));
+        strncpy(info->bus_info, "N/A", sizeof(info->bus_info));
+        info->n_stats = 0;
+        info->testinfo_len = 0;
+        info->regdump_len = 0;
+        info->eedump_len = 0;
+}
+
+static int octeon_mgmt_get_settings(struct net_device *netdev,
+                                    struct ethtool_cmd *cmd)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+
+        if (p->phydev)
+                return phy_ethtool_gset(p->phydev, cmd);
+
+        return -EINVAL;
+}
+
+static int octeon_mgmt_set_settings(struct net_device *netdev,
+                                    struct ethtool_cmd *cmd)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        if (p->phydev)
+                return phy_ethtool_sset(p->phydev, cmd);
+
+        return -EINVAL;
+}
+
+static const struct ethtool_ops octeon_mgmt_ethtool_ops = {
+        .get_drvinfo = octeon_mgmt_get_drvinfo,
+        .get_link = ethtool_op_get_link,
+        .get_settings = octeon_mgmt_get_settings,
+        .set_settings = octeon_mgmt_set_settings
+};
+
+static const struct net_device_ops octeon_mgmt_ops = {
+        .ndo_open =                     octeon_mgmt_open,
+        .ndo_stop =                     octeon_mgmt_stop,
+        .ndo_start_xmit =               octeon_mgmt_xmit,
+        .ndo_set_rx_mode =              octeon_mgmt_set_rx_filtering,
+        .ndo_set_multicast_list =       octeon_mgmt_set_rx_filtering,
+        .ndo_set_mac_address =          octeon_mgmt_set_mac_address,
+        .ndo_do_ioctl =                 octeon_mgmt_ioctl,
+        .ndo_change_mtu =               octeon_mgmt_change_mtu,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller =          octeon_mgmt_poll_controller,
+#endif
+};
+
+static int __init octeon_mgmt_probe(struct platform_device *pdev)
+{
+        struct resource *res_irq;
+        struct net_device *netdev;
+        struct octeon_mgmt *p;
+        int i;
+
+        netdev = alloc_etherdev(sizeof(struct octeon_mgmt));
+        if (netdev == NULL)
+                return -ENOMEM;
+
+        dev_set_drvdata(&pdev->dev, netdev);
+        p = netdev_priv(netdev);
+        netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,
+                       OCTEON_MGMT_NAPI_WEIGHT);
+
+        p->netdev = netdev;
+        p->dev = &pdev->dev;
+
+        p->port = pdev->id;
+        snprintf(netdev->name, IFNAMSIZ, "mgmt%d", p->port);
+
+        res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!res_irq)
+                goto err;
+
+        p->irq = res_irq->start;
+        spin_lock_init(&p->lock);
+
+        skb_queue_head_init(&p->tx_list);
+        skb_queue_head_init(&p->rx_list);
+        tasklet_init(&p->tx_clean_tasklet,
+                     octeon_mgmt_clean_tx_tasklet, (unsigned long)p);
+
+        netdev->netdev_ops = &octeon_mgmt_ops;
+        netdev->ethtool_ops = &octeon_mgmt_ethtool_ops;
+
+
+        /* The mgmt ports get the first N MACs.  */
+        for (i = 0; i < 6; i++)
+                netdev->dev_addr[i] = octeon_bootinfo->mac_addr_base[i];
+        netdev->dev_addr[5] += p->port;
+
+        if (p->port >= octeon_bootinfo->mac_addr_count)
+                dev_err(&pdev->dev,
+                        "Error %s: Using MAC outside of the assigned range: "
+                        "%02x:%02x:%02x:%02x:%02x:%02x\n", netdev->name,
+                        netdev->dev_addr[0], netdev->dev_addr[1],
+                        netdev->dev_addr[2], netdev->dev_addr[3],
+                        netdev->dev_addr[4], netdev->dev_addr[5]);
+
+        if (register_netdev(netdev))
+                goto err;
+
+        dev_info(&pdev->dev, "Version " DRV_VERSION "\n");
+        return 0;
+err:
+        free_netdev(netdev);
+        return -ENOENT;
+}
+
+static int __exit octeon_mgmt_remove(struct platform_device *pdev)
+{
+        struct net_device *netdev = dev_get_drvdata(&pdev->dev);
+
+        unregister_netdev(netdev);
+        free_netdev(netdev);
+        return 0;
+}
+
+static struct platform_driver octeon_mgmt_driver = {
+        .driver = {
+                .name           = "octeon_mgmt",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = octeon_mgmt_probe,
+        .remove         = __exit_p(octeon_mgmt_remove),
+};
+
+extern void octeon_mdiobus_force_mod_depencency(void);
+
+static int __init octeon_mgmt_mod_init(void)
+{
+        /* Force our mdiobus driver module to be loaded first. */
+        octeon_mdiobus_force_mod_depencency();
+        return platform_driver_register(&octeon_mgmt_driver);
+}
+
+static void __exit octeon_mgmt_mod_exit(void)
+{
+        platform_driver_unregister(&octeon_mgmt_driver);
+}
+
+module_init(octeon_mgmt_mod_init);
+module_exit(octeon_mgmt_mod_exit);
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_AUTHOR("David Daney");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 17a27225cc98..98938ea9e0bd 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -912,7 +912,11 @@ static void media_check(unsigned long arg)
         if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) {
                 if (!lp->fast_poll)
                         printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
+
+                local_irq_save(flags);
                 el3_interrupt(dev->irq, dev);
+                local_irq_restore(flags);
+
                 lp->fast_poll = HZ;
         }
         if (lp->fast_poll) {
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 6f8d7e2e5922..322e11df0097 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -711,7 +711,11 @@ static void media_check(unsigned long arg)
         (inb(ioaddr + EL3_TIMER) == 0xff)) {
         if (!lp->fast_poll)
             printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name);
+
+        local_irq_save(flags);
         el3_interrupt(dev->irq, dev);
+        local_irq_restore(flags);
+
         lp->fast_poll = HZ;
     }
     if (lp->fast_poll) {
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 8a5ae3b182ed..12e3233868e9 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -1402,7 +1402,6 @@ static void BuildLAF(int *ladrf, int *adr)
   for (i = 0; i < 8; i++)
     printk(KERN_CONT " %02X", ladrf[i]);
   printk(KERN_CONT "\n");
-  }
 #endif
 } /* BuildLAF */
 
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 92ed3fbf89a5..776cad2f5715 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1741,7 +1741,7 @@ static struct pcmcia_device_id pcnet_ids[] = {
         PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "cis/DP83903.cis"),
         PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "cis/DP83903.cis"),
         PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "cis/LA-PCM.cis"),
-        PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"),
+        PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "cis/PE520.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "cis/NE2K.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID12("PMX   ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "cis/PE-200.cis"),
         PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "cis/tamarack.cis"),
@@ -1754,7 +1754,7 @@ MODULE_DEVICE_TABLE(pcmcia, pcnet_ids);
 MODULE_FIRMWARE("cis/PCMLM28.cis");
 MODULE_FIRMWARE("cis/DP83903.cis");
 MODULE_FIRMWARE("cis/LA-PCM.cis");
-MODULE_FIRMWARE("PE520.cis");
+MODULE_FIRMWARE("cis/PE520.cis");
 MODULE_FIRMWARE("cis/NE2K.cis");
 MODULE_FIRMWARE("cis/PE-200.cis");
 MODULE_FIRMWARE("cis/tamarack.cis");
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index dcc67a35e8f2..e154677ff706 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -45,6 +45,7 @@ static const char *const version =
 #include <linux/crc32.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/moduleparam.h>
@@ -1765,7 +1766,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 
         /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */
         if (!is_valid_ether_addr(dev->perm_addr))
-                memset(dev->dev_addr, 0, sizeof(dev->dev_addr));
+                memset(dev->dev_addr, 0, ETH_ALEN);
 
         if (pcnet32_debug & NETIF_MSG_PROBE) {
                 printk(" %pM", dev->dev_addr);
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index d5d8e1c5bc91..fc5938ba3d78 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -115,4 +115,15 @@ config MDIO_GPIO
           To compile this driver as a module, choose M here: the module
           will be called mdio-gpio.
 
+config MDIO_OCTEON
+        tristate "Support for MDIO buses on Octeon SOCs"
+        depends on  CPU_CAVIUM_OCTEON
+        default y
+        help
+
+          This module provides a driver for the Octeon MDIO busses.
+          It is required by the Octeon Ethernet device drivers.
+
+          If in doubt, say Y.
+
 endif # PHYLIB
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index edfaac48cbd5..1342585af381 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -20,3 +20,4 @@ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
 obj-$(CONFIG_MDIO_GPIO)         += mdio-gpio.o
 obj-$(CONFIG_NATIONAL_PHY)      += national.o
 obj-$(CONFIG_STE10XP)           += ste10Xp.o
+obj-$(CONFIG_MDIO_OCTEON)       += mdio-octeon.o
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index f63c96a4ecb4..33c4b12a63ba 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -326,12 +326,13 @@ error:
 
 static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
 {
-        u32 val, orig;
+        u32 orig;
+        int val;
         bool clk125en = true;
 
         /* Abort if we are using an untested phy. */
-        if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 ||
-            BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 ||
+        if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 &&
+            BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 &&
             BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M)
                 return;
 
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
new file mode 100644
index 000000000000..61a4461cbda5
--- /dev/null
+++ b/drivers/net/phy/mdio-octeon.c
@@ -0,0 +1,180 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2009 Cavium Networks
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/phy.h>
+
+#include <asm/octeon/octeon.h>
+#include <asm/octeon/cvmx-smix-defs.h>
+
+#define DRV_VERSION "1.0"
+#define DRV_DESCRIPTION "Cavium Networks Octeon SMI/MDIO driver"
+
+struct octeon_mdiobus {
+        struct mii_bus *mii_bus;
+        int unit;
+        int phy_irq[PHY_MAX_ADDR];
+};
+
+static int octeon_mdiobus_read(struct mii_bus *bus, int phy_id, int regnum)
+{
+        struct octeon_mdiobus *p = bus->priv;
+        union cvmx_smix_cmd smi_cmd;
+        union cvmx_smix_rd_dat smi_rd;
+        int timeout = 1000;
+
+        smi_cmd.u64 = 0;
+        smi_cmd.s.phy_op = 1; /* MDIO_CLAUSE_22_READ */
+        smi_cmd.s.phy_adr = phy_id;
+        smi_cmd.s.reg_adr = regnum;
+        cvmx_write_csr(CVMX_SMIX_CMD(p->unit), smi_cmd.u64);
+
+        do {
+                /*
+                 * Wait 1000 clocks so we don't saturate the RSL bus
+                 * doing reads.
+                 */
+                cvmx_wait(1000);
+                smi_rd.u64 = cvmx_read_csr(CVMX_SMIX_RD_DAT(p->unit));
+        } while (smi_rd.s.pending && --timeout);
+
+        if (smi_rd.s.val)
+                return smi_rd.s.dat;
+        else
+                return -EIO;
+}
+
+static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id,
+                                int regnum, u16 val)
+{
+        struct octeon_mdiobus *p = bus->priv;
+        union cvmx_smix_cmd smi_cmd;
+        union cvmx_smix_wr_dat smi_wr;
+        int timeout = 1000;
+
+        smi_wr.u64 = 0;
+        smi_wr.s.dat = val;
+        cvmx_write_csr(CVMX_SMIX_WR_DAT(p->unit), smi_wr.u64);
+
+        smi_cmd.u64 = 0;
+        smi_cmd.s.phy_op = 0; /* MDIO_CLAUSE_22_WRITE */
+        smi_cmd.s.phy_adr = phy_id;
+        smi_cmd.s.reg_adr = regnum;
+        cvmx_write_csr(CVMX_SMIX_CMD(p->unit), smi_cmd.u64);
+
+        do {
+                /*
+                 * Wait 1000 clocks so we don't saturate the RSL bus
+                 * doing reads.
+                 */
+                cvmx_wait(1000);
+                smi_wr.u64 = cvmx_read_csr(CVMX_SMIX_WR_DAT(p->unit));
+        } while (smi_wr.s.pending && --timeout);
+
+        if (timeout <= 0)
+                return -EIO;
+
+        return 0;
+}
+
+static int __init octeon_mdiobus_probe(struct platform_device *pdev)
+{
+        struct octeon_mdiobus *bus;
+        int i;
+        int err = -ENOENT;
+
+        bus = devm_kzalloc(&pdev->dev, sizeof(*bus), GFP_KERNEL);
+        if (!bus)
+                return -ENOMEM;
+
+        /* The platform_device id is our unit number.  */
+        bus->unit = pdev->id;
+
+        bus->mii_bus = mdiobus_alloc();
+
+        if (!bus->mii_bus)
+                goto err;
+
+        /*
+         * Standard Octeon evaluation boards don't support phy
+         * interrupts, we need to poll.
+         */
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                bus->phy_irq[i] = PHY_POLL;
+
+        bus->mii_bus->priv = bus;
+        bus->mii_bus->irq = bus->phy_irq;
+        bus->mii_bus->name = "mdio-octeon";
+        snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%x", bus->unit);
+        bus->mii_bus->parent = &pdev->dev;
+
+        bus->mii_bus->read = octeon_mdiobus_read;
+        bus->mii_bus->write = octeon_mdiobus_write;
+
+        dev_set_drvdata(&pdev->dev, bus);
+
+        err = mdiobus_register(bus->mii_bus);
+        if (err)
+                goto err_register;
+
+        dev_info(&pdev->dev, "Version " DRV_VERSION "\n");
+
+        return 0;
+err_register:
+        mdiobus_free(bus->mii_bus);
+
+err:
+        devm_kfree(&pdev->dev, bus);
+        return err;
+}
+
+static int __exit octeon_mdiobus_remove(struct platform_device *pdev)
+{
+        struct octeon_mdiobus *bus;
+
+        bus = dev_get_drvdata(&pdev->dev);
+
+        mdiobus_unregister(bus->mii_bus);
+        mdiobus_free(bus->mii_bus);
+        return 0;
+}
+
+static struct platform_driver octeon_mdiobus_driver = {
+        .driver = {
+                .name           = "mdio-octeon",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = octeon_mdiobus_probe,
+        .remove         = __exit_p(octeon_mdiobus_remove),
+};
+
+void octeon_mdiobus_force_mod_depencency(void)
+{
+        /* Let ethernet drivers force us to be loaded.  */
+}
+EXPORT_SYMBOL(octeon_mdiobus_force_mod_depencency);
+
+static int __init octeon_mdiobus_mod_init(void)
+{
+        return platform_driver_register(&octeon_mdiobus_driver);
+}
+
+static void __exit octeon_mdiobus_mod_exit(void)
+{
+        platform_driver_unregister(&octeon_mdiobus_driver);
+}
+
+module_init(octeon_mdiobus_mod_init);
+module_exit(octeon_mdiobus_mod_exit);
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("David Daney");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index bd4e8d72dc08..e17b70291bbc 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -264,6 +264,8 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
                 (phydev->phy_id & phydrv->phy_id_mask));
 }
 
+#ifdef CONFIG_PM
+
 static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
 {
         struct device_driver *drv = phydev->dev.driver;
@@ -295,34 +297,88 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
         return true;
 }
 
-/* Suspend and resume.  Copied from platform_suspend and
- * platform_resume
- */
-static int mdio_bus_suspend(struct device * dev, pm_message_t state)
+static int mdio_bus_suspend(struct device *dev)
 {
         struct phy_driver *phydrv = to_phy_driver(dev->driver);
         struct phy_device *phydev = to_phy_device(dev);
 
+        /*
+         * We must stop the state machine manually, otherwise it stops out of
+         * control, possibly with the phydev->lock held. Upon resume, netdev
+         * may call phy routines that try to grab the same lock, and that may
+         * lead to a deadlock.
+         */
+        if (phydev->attached_dev)
+                phy_stop_machine(phydev);
+
         if (!mdio_bus_phy_may_suspend(phydev))
                 return 0;
+
         return phydrv->suspend(phydev);
 }
 
-static int mdio_bus_resume(struct device * dev)
+static int mdio_bus_resume(struct device *dev)
 {
         struct phy_driver *phydrv = to_phy_driver(dev->driver);
         struct phy_device *phydev = to_phy_device(dev);
+        int ret;
 
         if (!mdio_bus_phy_may_suspend(phydev))
+                goto no_resume;
+
+        ret = phydrv->resume(phydev);
+        if (ret < 0)
+                return ret;
+
+no_resume:
+        if (phydev->attached_dev)
+                phy_start_machine(phydev, NULL);
+
+        return 0;
+}
+
+static int mdio_bus_restore(struct device *dev)
+{
+        struct phy_device *phydev = to_phy_device(dev);
+        struct net_device *netdev = phydev->attached_dev;
+        int ret;
+
+        if (!netdev)
                 return 0;
-        return phydrv->resume(phydev);
+
+        ret = phy_init_hw(phydev);
+        if (ret < 0)
+                return ret;
+
+        /* The PHY needs to renegotiate. */
+        phydev->link = 0;
+        phydev->state = PHY_UP;
+
+        phy_start_machine(phydev, NULL);
+
+        return 0;
 }
 
+static struct dev_pm_ops mdio_bus_pm_ops = {
+        .suspend = mdio_bus_suspend,
+        .resume = mdio_bus_resume,
+        .freeze = mdio_bus_suspend,
+        .thaw = mdio_bus_resume,
+        .restore = mdio_bus_restore,
+};
+
+#define MDIO_BUS_PM_OPS (&mdio_bus_pm_ops)
+
+#else
+
+#define MDIO_BUS_PM_OPS NULL
+
+#endif /* CONFIG_PM */
+
 struct bus_type mdio_bus_type = {
         .name           = "mdio_bus",
         .match          = mdio_bus_match,
-        .suspend        = mdio_bus_suspend,
-        .resume         = mdio_bus_resume,
+        .pm             = MDIO_BUS_PM_OPS,
 };
 EXPORT_SYMBOL(mdio_bus_type);
 
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index b10fedd82143..8212b2b93422 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -378,6 +378,20 @@ void phy_disconnect(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_disconnect);
 
+int phy_init_hw(struct phy_device *phydev)
+{
+        int ret;
+
+        if (!phydev->drv || !phydev->drv->config_init)
+                return 0;
+
+        ret = phy_scan_fixups(phydev);
+        if (ret < 0)
+                return ret;
+
+        return phydev->drv->config_init(phydev);
+}
+
 /**
  * phy_attach_direct - attach a network device to a given PHY device pointer
  * @dev: network device to attach
@@ -425,21 +439,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
         /* Do initial configuration here, now that
          * we have certain key parameters
          * (dev_flags and interface) */
-        if (phydev->drv->config_init) {
-                int err;
-
-                err = phy_scan_fixups(phydev);
-
-                if (err < 0)
-                        return err;
-
-                err = phydev->drv->config_init(phydev);
-
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
+        return phy_init_hw(phydev);
 }
 EXPORT_SYMBOL(phy_attach_direct);
 
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index acfc5a3aa490..60f96c468a24 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4859,7 +4859,7 @@ out:
         return 0;
 }
 
-static struct dev_pm_ops rtl8169_pm_ops = {
+static const struct dev_pm_ops rtl8169_pm_ops = {
         .suspend = rtl8169_suspend,
         .resume = rtl8169_resume,
         .freeze = rtl8169_suspend,
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 20a71749154a..1c257098d0a6 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -1293,7 +1293,7 @@ static void rr_dump(struct net_device *dev)
 
         printk("Error code 0x%x\n", readl(&regs->Fail1));
 
-        index = (((readl(&regs->EvtPrd) >> 8) & 0xff ) - 1) % EVT_RING_ENTRIES;
+        index = (((readl(&regs->EvtPrd) >> 8) & 0xff) - 1) % TX_RING_ENTRIES;
         cons = rrpriv->dirty_tx;
         printk("TX ring index %i, TX consumer %i\n",
                index, cons);
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index f983e3b507cc..103e8b0e2a0d 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -741,14 +741,14 @@ static int efx_probe_port(struct efx_nic *efx)
 
         EFX_LOG(efx, "create port\n");
 
+        if (phy_flash_cfg)
+                efx->phy_mode = PHY_MODE_SPECIAL;
+
         /* Connect up MAC/PHY operations table */
         rc = efx->type->probe_port(efx);
         if (rc)
                 goto err;
 
-        if (phy_flash_cfg)
-                efx->phy_mode = PHY_MODE_SPECIAL;
-
         /* Sanity check MAC address */
         if (is_valid_ether_addr(efx->mac_address)) {
                 memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN);
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 17afcd26e870..9d009c46e962 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -925,6 +925,7 @@ static int falcon_probe_port(struct efx_nic *efx)
 
 static void falcon_remove_port(struct efx_nic *efx)
 {
+        efx->phy_op->remove(efx);
         efx_nic_free_buffer(efx, &efx->stats_buffer);
 }
 
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c
index 3da933f8f079..8ccab2c67a20 100644
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
@@ -111,16 +111,12 @@ static void falcon_mask_status_intr(struct efx_nic *efx, bool enable)
         efx_writeo(efx, &reg, FR_AB_XM_MGT_INT_MASK);
 }
 
-/* Get status of XAUI link */
-static bool falcon_xaui_link_ok(struct efx_nic *efx)
+static bool falcon_xgxs_link_ok(struct efx_nic *efx)
 {
         efx_oword_t reg;
         bool align_done, link_ok = false;
         int sync_status;
 
-        if (LOOPBACK_INTERNAL(efx))
-                return true;
-
         /* Read link status */
         efx_reado(efx, &reg, FR_AB_XX_CORE_STAT);
 
@@ -135,14 +131,24 @@ static bool falcon_xaui_link_ok(struct efx_nic *efx)
         EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_DISPERR, FFE_AB_XX_STAT_ALL_LANES);
         efx_writeo(efx, &reg, FR_AB_XX_CORE_STAT);
 
-        /* If the link is up, then check the phy side of the xaui link */
-        if (efx->link_state.up && link_ok)
-                if (efx->mdio.mmds & (1 << MDIO_MMD_PHYXS))
-                        link_ok = efx_mdio_phyxgxs_lane_sync(efx);
-
         return link_ok;
 }
 
+static bool falcon_xmac_link_ok(struct efx_nic *efx)
+{
+        /*
+         * Check MAC's XGXS link status except when using XGMII loopback
+         * which bypasses the XGXS block.
+         * If possible, check PHY's XGXS link status except when using
+         * MAC loopback.
+         */
+        return (efx->loopback_mode == LOOPBACK_XGMII ||
+                falcon_xgxs_link_ok(efx)) &&
+                (!(efx->mdio.mmds & (1 << MDIO_MMD_PHYXS)) ||
+                 LOOPBACK_INTERNAL(efx) || 
+                 efx_mdio_phyxgxs_lane_sync(efx));
+}
+
 void falcon_reconfigure_xmac_core(struct efx_nic *efx)
 {
         unsigned int max_frame_len;
@@ -245,9 +251,9 @@ static void falcon_reconfigure_xgxs_core(struct efx_nic *efx)
 
 
 /* Try to bring up the Falcon side of the Falcon-Phy XAUI link */
-static bool falcon_check_xaui_link_up(struct efx_nic *efx, int tries)
+static bool falcon_xmac_link_ok_retry(struct efx_nic *efx, int tries)
 {
-        bool mac_up = falcon_xaui_link_ok(efx);
+        bool mac_up = falcon_xmac_link_ok(efx);
 
         if (LOOPBACK_MASK(efx) & LOOPBACKS_EXTERNAL(efx) & LOOPBACKS_WS ||
             efx_phy_mode_disabled(efx->phy_mode))
@@ -261,7 +267,7 @@ static bool falcon_check_xaui_link_up(struct efx_nic *efx, int tries)
                 falcon_reset_xaui(efx);
                 udelay(200);
 
-                mac_up = falcon_xaui_link_ok(efx);
+                mac_up = falcon_xmac_link_ok(efx);
                 --tries;
         }
 
@@ -272,7 +278,7 @@ static bool falcon_check_xaui_link_up(struct efx_nic *efx, int tries)
 
 static bool falcon_xmac_check_fault(struct efx_nic *efx)
 {
-        return !falcon_check_xaui_link_up(efx, 5);
+        return !falcon_xmac_link_ok_retry(efx, 5);
 }
 
 static int falcon_reconfigure_xmac(struct efx_nic *efx)
@@ -284,7 +290,7 @@ static int falcon_reconfigure_xmac(struct efx_nic *efx)
 
         falcon_reconfigure_mac_wrapper(efx);
 
-        efx->xmac_poll_required = !falcon_check_xaui_link_up(efx, 5);
+        efx->xmac_poll_required = !falcon_xmac_link_ok_retry(efx, 5);
         falcon_mask_status_intr(efx, true);
 
         return 0;
@@ -357,7 +363,7 @@ void falcon_poll_xmac(struct efx_nic *efx)
                 return;
 
         falcon_mask_status_intr(efx, false);
-        efx->xmac_poll_required = !falcon_check_xaui_link_up(efx, 1);
+        efx->xmac_poll_required = !falcon_xmac_link_ok_retry(efx, 1);
         falcon_mask_status_intr(efx, true);
 }
 
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
index 683353b904c7..0d4eba7266ec 100644
--- a/drivers/net/sfc/mcdi.c
+++ b/drivers/net/sfc/mcdi.c
@@ -142,8 +142,9 @@ static int efx_mcdi_poll(struct efx_nic *efx)
                 if (spins != 0) {
                         --spins;
                         udelay(1);
-                } else
-                        schedule();
+                } else {
+                        schedule_timeout_uninterruptible(1);
+                }
 
                 time = get_seconds();
 
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c
index 0e1bcc5a0d52..eb694af7a473 100644
--- a/drivers/net/sfc/mcdi_phy.c
+++ b/drivers/net/sfc/mcdi_phy.c
@@ -304,31 +304,47 @@ static u32 mcdi_to_ethtool_media(u32 media)
 
 static int efx_mcdi_phy_probe(struct efx_nic *efx)
 {
-        struct efx_mcdi_phy_cfg *phy_cfg;
+        struct efx_mcdi_phy_cfg *phy_data;
+        u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];
+        u32 caps;
         int rc;
 
-        /* TODO: Move phy_data initialisation to
-         * phy_op->probe/remove, rather than init/fini */
-        phy_cfg = kzalloc(sizeof(*phy_cfg), GFP_KERNEL);
-        if (phy_cfg == NULL) {
-                rc = -ENOMEM;
-                goto fail_alloc;
-        }
-        rc = efx_mcdi_get_phy_cfg(efx, phy_cfg);
+        /* Initialise and populate phy_data */
+        phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);
+        if (phy_data == NULL)
+                return -ENOMEM;
+
+        rc = efx_mcdi_get_phy_cfg(efx, phy_data);
         if (rc != 0)
                 goto fail;
 
-        efx->phy_type = phy_cfg->type;
+        /* Read initial link advertisement */
+        BUILD_BUG_ON(MC_CMD_GET_LINK_IN_LEN != 0);
+        rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,
+                          outbuf, sizeof(outbuf), NULL);
+        if (rc)
+                goto fail;
+
+        /* Fill out nic state */
+        efx->phy_data = phy_data;
+        efx->phy_type = phy_data->type;
 
-        efx->mdio_bus = phy_cfg->channel;
-        efx->mdio.prtad = phy_cfg->port;
-        efx->mdio.mmds = phy_cfg->mmd_mask & ~(1 << MC_CMD_MMD_CLAUSE22);
+        efx->mdio_bus = phy_data->channel;
+        efx->mdio.prtad = phy_data->port;
+        efx->mdio.mmds = phy_data->mmd_mask & ~(1 << MC_CMD_MMD_CLAUSE22);
         efx->mdio.mode_support = 0;
-        if (phy_cfg->mmd_mask & (1 << MC_CMD_MMD_CLAUSE22))
+        if (phy_data->mmd_mask & (1 << MC_CMD_MMD_CLAUSE22))
                 efx->mdio.mode_support |= MDIO_SUPPORTS_C22;
-        if (phy_cfg->mmd_mask & ~(1 << MC_CMD_MMD_CLAUSE22))
+        if (phy_data->mmd_mask & ~(1 << MC_CMD_MMD_CLAUSE22))
                 efx->mdio.mode_support |= MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
 
+        caps = MCDI_DWORD(outbuf, GET_LINK_OUT_CAP);
+        if (caps & (1 << MC_CMD_PHY_CAP_AN_LBN))
+                efx->link_advertising =
+                        mcdi_to_ethtool_cap(phy_data->media, caps);
+        else
+                phy_data->forced_cap = caps;
+
         /* Assert that we can map efx -> mcdi loopback modes */
         BUILD_BUG_ON(LOOPBACK_NONE != MC_CMD_LOOPBACK_NONE);
         BUILD_BUG_ON(LOOPBACK_DATA != MC_CMD_LOOPBACK_DATA);
@@ -365,46 +381,6 @@ static int efx_mcdi_phy_probe(struct efx_nic *efx)
          * but by convention we don't */
         efx->loopback_modes &= ~(1 << LOOPBACK_NONE);
 
-        kfree(phy_cfg);
-
-        return 0;
-
-fail:
-        kfree(phy_cfg);
-fail_alloc:
-        return rc;
-}
-
-static int efx_mcdi_phy_init(struct efx_nic *efx)
-{
-        struct efx_mcdi_phy_cfg *phy_data;
-        u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];
-        u32 caps;
-        int rc;
-
-        phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);
-        if (phy_data == NULL)
-                return -ENOMEM;
-
-        rc = efx_mcdi_get_phy_cfg(efx, phy_data);
-        if (rc != 0)
-                goto fail;
-
-        efx->phy_data = phy_data;
-
-        BUILD_BUG_ON(MC_CMD_GET_LINK_IN_LEN != 0);
-        rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,
-                          outbuf, sizeof(outbuf), NULL);
-        if (rc)
-                goto fail;
-
-        caps = MCDI_DWORD(outbuf, GET_LINK_OUT_CAP);
-        if (caps & (1 << MC_CMD_PHY_CAP_AN_LBN))
-                efx->link_advertising =
-                        mcdi_to_ethtool_cap(phy_data->media, caps);
-        else
-                phy_data->forced_cap = caps;
-
         return 0;
 
 fail:
@@ -504,7 +480,7 @@ static bool efx_mcdi_phy_poll(struct efx_nic *efx)
         return !efx_link_state_equal(&efx->link_state, &old_state);
 }
 
-static void efx_mcdi_phy_fini(struct efx_nic *efx)
+static void efx_mcdi_phy_remove(struct efx_nic *efx)
 {
         struct efx_mcdi_phy_data *phy_data = efx->phy_data;
 
@@ -586,10 +562,11 @@ static int efx_mcdi_phy_set_settings(struct efx_nic *efx, struct ethtool_cmd *ec
 
 struct efx_phy_operations efx_mcdi_phy_ops = {
         .probe          = efx_mcdi_phy_probe,
-        .init           = efx_mcdi_phy_init,
+        .init           = efx_port_dummy_op_int,
         .reconfigure    = efx_mcdi_phy_reconfigure,
         .poll           = efx_mcdi_phy_poll,
-        .fini           = efx_mcdi_phy_fini,
+        .fini           = efx_port_dummy_op_void,
+        .remove         = efx_mcdi_phy_remove,
         .get_settings   = efx_mcdi_phy_get_settings,
         .set_settings   = efx_mcdi_phy_set_settings,
         .run_tests      = NULL,
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 34c381f009b7..d5aab5b3fa06 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -524,6 +524,7 @@ struct efx_phy_operations {
         int (*probe) (struct efx_nic *efx);
         int (*init) (struct efx_nic *efx);
         void (*fini) (struct efx_nic *efx);
+        void (*remove) (struct efx_nic *efx);
         int (*reconfigure) (struct efx_nic *efx);
         bool (*poll) (struct efx_nic *efx);
         void (*get_settings) (struct efx_nic *efx,
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index a577be227862..db44224ed2ca 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -1576,6 +1576,8 @@ void efx_nic_init_common(struct efx_nic *efx)
         EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_SOFT_EVT_EN, 1);
         /* Prefetch threshold 2 => fetch when descriptor cache half empty */
         EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_PREF_THRESHOLD, 2);
+        /* Disable hardware watchdog which can misfire */
+        EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_PREF_WD_TMR, 0x3fffff);
         /* Squash TX of packets of 16 bytes or less */
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0)
                 EFX_SET_OWORD_FIELD(temp, FRF_BZ_TX_FLUSH_MIN_LEN_EN, 1);
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c
index 3800fc791b2f..ff8f0a417fa3 100644
--- a/drivers/net/sfc/qt202x_phy.c
+++ b/drivers/net/sfc/qt202x_phy.c
@@ -33,6 +33,9 @@
 #define PCS_FW_HEARTBEAT_REG    0xd7ee
 #define PCS_FW_HEARTB_LBN       0
 #define PCS_FW_HEARTB_WIDTH     8
+#define PCS_FW_PRODUCT_CODE_1   0xd7f0
+#define PCS_FW_VERSION_1        0xd7f3
+#define PCS_FW_BUILD_1          0xd7f6
 #define PCS_UC8051_STATUS_REG   0xd7fd
 #define PCS_UC_STATUS_LBN       0
 #define PCS_UC_STATUS_WIDTH     8
@@ -52,14 +55,24 @@ void falcon_qt202x_set_led(struct efx_nic *p, int led, int mode)
 
 struct qt202x_phy_data {
         enum efx_phy_mode phy_mode;
+        bool bug17190_in_bad_state;
+        unsigned long bug17190_timer;
+        u32 firmware_ver;
 };
 
 #define QT2022C2_MAX_RESET_TIME 500
 #define QT2022C2_RESET_WAIT 10
 
-static int qt2025c_wait_reset(struct efx_nic *efx)
+#define QT2025C_MAX_HEARTB_TIME (5 * HZ)
+#define QT2025C_HEARTB_WAIT 100
+#define QT2025C_MAX_FWSTART_TIME (25 * HZ / 10)
+#define QT2025C_FWSTART_WAIT 100
+
+#define BUG17190_INTERVAL (2 * HZ)
+
+static int qt2025c_wait_heartbeat(struct efx_nic *efx)
 {
-        unsigned long timeout = jiffies + 10 * HZ;
+        unsigned long timeout = jiffies + QT2025C_MAX_HEARTB_TIME;
         int reg, old_counter = 0;
 
         /* Wait for firmware heartbeat to start */
@@ -74,11 +87,25 @@ static int qt2025c_wait_reset(struct efx_nic *efx)
                         old_counter = counter;
                 else if (counter != old_counter)
                         break;
-                if (time_after(jiffies, timeout))
+                if (time_after(jiffies, timeout)) {
+                        /* Some cables have EEPROMs that conflict with the
+                         * PHY's on-board EEPROM so it cannot load firmware */
+                        EFX_ERR(efx, "If an SFP+ direct attach cable is"
+                                " connected, please check that it complies"
+                                " with the SFP+ specification\n");
                         return -ETIMEDOUT;
-                msleep(10);
+                }
+                msleep(QT2025C_HEARTB_WAIT);
         }
 
+        return 0;
+}
+
+static int qt2025c_wait_fw_status_good(struct efx_nic *efx)
+{
+        unsigned long timeout = jiffies + QT2025C_MAX_FWSTART_TIME;
+        int reg;
+
         /* Wait for firmware status to look good */
         for (;;) {
                 reg = efx_mdio_read(efx, MDIO_MMD_PCS, PCS_UC8051_STATUS_REG);
@@ -90,7 +117,178 @@ static int qt2025c_wait_reset(struct efx_nic *efx)
                         break;
                 if (time_after(jiffies, timeout))
                         return -ETIMEDOUT;
+                msleep(QT2025C_FWSTART_WAIT);
+        }
+
+        return 0;
+}
+
+static void qt2025c_restart_firmware(struct efx_nic *efx)
+{
+        /* Restart microcontroller execution of firmware from RAM */
+        efx_mdio_write(efx, 3, 0xe854, 0x00c0);
+        efx_mdio_write(efx, 3, 0xe854, 0x0040);
+        msleep(50);
+}
+
+static int qt2025c_wait_reset(struct efx_nic *efx)
+{
+        int rc;
+
+        rc = qt2025c_wait_heartbeat(efx);
+        if (rc != 0)
+                return rc;
+
+        rc = qt2025c_wait_fw_status_good(efx);
+        if (rc == -ETIMEDOUT) {
+                /* Bug 17689: occasionally heartbeat starts but firmware status
+                 * code never progresses beyond 0x00.  Try again, once, after
+                 * restarting execution of the firmware image. */
+                EFX_LOG(efx, "bashing QT2025C microcontroller\n");
+                qt2025c_restart_firmware(efx);
+                rc = qt2025c_wait_heartbeat(efx);
+                if (rc != 0)
+                        return rc;
+                rc = qt2025c_wait_fw_status_good(efx);
+        }
+
+        return rc;
+}
+
+static void qt2025c_firmware_id(struct efx_nic *efx)
+{
+        struct qt202x_phy_data *phy_data = efx->phy_data;
+        u8 firmware_id[9];
+        size_t i;
+
+        for (i = 0; i < sizeof(firmware_id); i++)
+                firmware_id[i] = efx_mdio_read(efx, MDIO_MMD_PCS,
+                                               PCS_FW_PRODUCT_CODE_1 + i);
+        EFX_INFO(efx, "QT2025C firmware %xr%d v%d.%d.%d.%d [20%02d-%02d-%02d]\n",
+                 (firmware_id[0] << 8) | firmware_id[1], firmware_id[2],
+                 firmware_id[3] >> 4, firmware_id[3] & 0xf,
+                 firmware_id[4], firmware_id[5],
+                 firmware_id[6], firmware_id[7], firmware_id[8]);
+        phy_data->firmware_ver = ((firmware_id[3] & 0xf0) << 20) |
+                                 ((firmware_id[3] & 0x0f) << 16) |
+                                 (firmware_id[4] << 8) | firmware_id[5];
+}
+
+static void qt2025c_bug17190_workaround(struct efx_nic *efx)
+{
+        struct qt202x_phy_data *phy_data = efx->phy_data;
+
+        /* The PHY can get stuck in a state where it reports PHY_XS and PMA/PMD
+         * layers up, but PCS down (no block_lock).  If we notice this state
+         * persisting for a couple of seconds, we switch PMA/PMD loopback
+         * briefly on and then off again, which is normally sufficient to
+         * recover it.
+         */
+        if (efx->link_state.up ||
+            !efx_mdio_links_ok(efx, MDIO_DEVS_PMAPMD | MDIO_DEVS_PHYXS)) {
+                phy_data->bug17190_in_bad_state = false;
+                return;
+        }
+
+        if (!phy_data->bug17190_in_bad_state) {
+                phy_data->bug17190_in_bad_state = true;
+                phy_data->bug17190_timer = jiffies + BUG17190_INTERVAL;
+                return;
+        }
+
+        if (time_after_eq(jiffies, phy_data->bug17190_timer)) {
+                EFX_LOG(efx, "bashing QT2025C PMA/PMD\n");
+                efx_mdio_set_flag(efx, MDIO_MMD_PMAPMD, MDIO_CTRL1,
+                                  MDIO_PMA_CTRL1_LOOPBACK, true);
                 msleep(100);
+                efx_mdio_set_flag(efx, MDIO_MMD_PMAPMD, MDIO_CTRL1,
+                                  MDIO_PMA_CTRL1_LOOPBACK, false);
+                phy_data->bug17190_timer = jiffies + BUG17190_INTERVAL;
+        }
+}
+
+static int qt2025c_select_phy_mode(struct efx_nic *efx)
+{
+        struct qt202x_phy_data *phy_data = efx->phy_data;
+        struct falcon_board *board = falcon_board(efx);
+        int reg, rc, i;
+        uint16_t phy_op_mode;
+
+        /* Only 2.0.1.0+ PHY firmware supports the more optimal SFP+
+         * Self-Configure mode.  Don't attempt any switching if we encounter
+         * older firmware. */
+        if (phy_data->firmware_ver < 0x02000100)
+                return 0;
+
+        /* In general we will get optimal behaviour in "SFP+ Self-Configure"
+         * mode; however, that powers down most of the PHY when no module is
+         * present, so we must use a different mode (any fixed mode will do)
+         * to be sure that loopbacks will work. */
+        phy_op_mode = (efx->loopback_mode == LOOPBACK_NONE) ? 0x0038 : 0x0020;
+
+        /* Only change mode if really necessary */
+        reg = efx_mdio_read(efx, 1, 0xc319);
+        if ((reg & 0x0038) == phy_op_mode)
+                return 0;
+        EFX_LOG(efx, "Switching PHY to mode 0x%04x\n", phy_op_mode);
+
+        /* This sequence replicates the register writes configured in the boot
+         * EEPROM (including the differences between board revisions), except
+         * that the operating mode is changed, and the PHY is prevented from
+         * unnecessarily reloading the main firmware image again. */
+        efx_mdio_write(efx, 1, 0xc300, 0x0000);
+        /* (Note: this portion of the boot EEPROM sequence, which bit-bashes 9
+         * STOPs onto the firmware/module I2C bus to reset it, varies across
+         * board revisions, as the bus is connected to different GPIO/LED
+         * outputs on the PHY.) */
+        if (board->major == 0 && board->minor < 2) {
+                efx_mdio_write(efx, 1, 0xc303, 0x4498);
+                for (i = 0; i < 9; i++) {
+                        efx_mdio_write(efx, 1, 0xc303, 0x4488);
+                        efx_mdio_write(efx, 1, 0xc303, 0x4480);
+                        efx_mdio_write(efx, 1, 0xc303, 0x4490);
+                        efx_mdio_write(efx, 1, 0xc303, 0x4498);
+                }
+        } else {
+                efx_mdio_write(efx, 1, 0xc303, 0x0920);
+                efx_mdio_write(efx, 1, 0xd008, 0x0004);
+                for (i = 0; i < 9; i++) {
+                        efx_mdio_write(efx, 1, 0xc303, 0x0900);
+                        efx_mdio_write(efx, 1, 0xd008, 0x0005);
+                        efx_mdio_write(efx, 1, 0xc303, 0x0920);
+                        efx_mdio_write(efx, 1, 0xd008, 0x0004);
+                }
+                efx_mdio_write(efx, 1, 0xc303, 0x4900);
+        }
+        efx_mdio_write(efx, 1, 0xc303, 0x4900);
+        efx_mdio_write(efx, 1, 0xc302, 0x0004);
+        efx_mdio_write(efx, 1, 0xc316, 0x0013);
+        efx_mdio_write(efx, 1, 0xc318, 0x0054);
+        efx_mdio_write(efx, 1, 0xc319, phy_op_mode);
+        efx_mdio_write(efx, 1, 0xc31a, 0x0098);
+        efx_mdio_write(efx, 3, 0x0026, 0x0e00);
+        efx_mdio_write(efx, 3, 0x0027, 0x0013);
+        efx_mdio_write(efx, 3, 0x0028, 0xa528);
+        efx_mdio_write(efx, 1, 0xd006, 0x000a);
+        efx_mdio_write(efx, 1, 0xd007, 0x0009);
+        efx_mdio_write(efx, 1, 0xd008, 0x0004);
+        /* This additional write is not present in the boot EEPROM.  It
+         * prevents the PHY's internal boot ROM doing another pointless (and
+         * slow) reload of the firmware image (the microcontroller's code
+         * memory is not affected by the microcontroller reset). */
+        efx_mdio_write(efx, 1, 0xc317, 0x00ff);
+        efx_mdio_write(efx, 1, 0xc300, 0x0002);
+        msleep(20);
+
+        /* Restart microcontroller execution of firmware from RAM */
+        qt2025c_restart_firmware(efx);
+
+        /* Wait for the microcontroller to be ready again */
+        rc = qt2025c_wait_reset(efx);
+        if (rc < 0) {
+                EFX_ERR(efx, "PHY microcontroller reset during mode switch "
+                                "timed out\n");
+                return rc;
         }
 
         return 0;
@@ -137,6 +335,16 @@ static int qt202x_reset_phy(struct efx_nic *efx)
 
 static int qt202x_phy_probe(struct efx_nic *efx)
 {
+        struct qt202x_phy_data *phy_data;
+
+        phy_data = kzalloc(sizeof(struct qt202x_phy_data), GFP_KERNEL);
+        if (!phy_data)
+                return -ENOMEM;
+        efx->phy_data = phy_data;
+        phy_data->phy_mode = efx->phy_mode;
+        phy_data->bug17190_in_bad_state = false;
+        phy_data->bug17190_timer = 0;
+
         efx->mdio.mmds = QT202X_REQUIRED_DEVS;
         efx->mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
         efx->loopback_modes = QT202X_LOOPBACKS | FALCON_XMAC_LOOPBACKS;
@@ -145,7 +353,6 @@ static int qt202x_phy_probe(struct efx_nic *efx)
 
 static int qt202x_phy_init(struct efx_nic *efx)
 {
-        struct qt202x_phy_data *phy_data;
         u32 devid;
         int rc;
 
@@ -155,17 +362,14 @@ static int qt202x_phy_init(struct efx_nic *efx)
                 return rc;
         }
 
-        phy_data = kzalloc(sizeof(struct qt202x_phy_data), GFP_KERNEL);
-        if (!phy_data)
-                return -ENOMEM;
-        efx->phy_data = phy_data;
-
         devid = efx_mdio_read_id(efx, MDIO_MMD_PHYXS);
         EFX_INFO(efx, "PHY ID reg %x (OUI %06x model %02x revision %x)\n",
                  devid, efx_mdio_id_oui(devid), efx_mdio_id_model(devid),
                  efx_mdio_id_rev(devid));
 
-        phy_data->phy_mode = efx->phy_mode;
+        if (efx->phy_type == PHY_TYPE_QT2025C)
+                qt2025c_firmware_id(efx);
+
         return 0;
 }
 
@@ -183,6 +387,9 @@ static bool qt202x_phy_poll(struct efx_nic *efx)
         efx->link_state.fd = true;
         efx->link_state.fc = efx->wanted_fc;
 
+        if (efx->phy_type == PHY_TYPE_QT2025C)
+                qt2025c_bug17190_workaround(efx);
+
         return efx->link_state.up != was_up;
 }
 
@@ -191,6 +398,10 @@ static int qt202x_phy_reconfigure(struct efx_nic *efx)
         struct qt202x_phy_data *phy_data = efx->phy_data;
 
         if (efx->phy_type == PHY_TYPE_QT2025C) {
+                int rc = qt2025c_select_phy_mode(efx);
+                if (rc)
+                        return rc;
+
                 /* There are several different register bits which can
                  * disable TX (and save power) on direct-attach cables
                  * or optical transceivers, varying somewhat between
@@ -224,7 +435,7 @@ static void qt202x_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecm
         mdio45_ethtool_gset(&efx->mdio, ecmd);
 }
 
-static void qt202x_phy_fini(struct efx_nic *efx)
+static void qt202x_phy_remove(struct efx_nic *efx)
 {
         /* Free the context block */
         kfree(efx->phy_data);
@@ -236,7 +447,8 @@ struct efx_phy_operations falcon_qt202x_phy_ops = {
         .init            = qt202x_phy_init,
         .reconfigure     = qt202x_phy_reconfigure,
         .poll            = qt202x_phy_poll,
-        .fini            = qt202x_phy_fini,
+        .fini            = efx_port_dummy_op_void,
+        .remove          = qt202x_phy_remove,
         .get_settings    = qt202x_phy_get_settings,
         .set_settings    = efx_mdio_set_settings,
 };
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 14949bb303a0..250c8827b842 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -47,7 +47,7 @@ static const unsigned char payload_source[ETH_ALEN] = {
         0x00, 0x0f, 0x53, 0x1b, 0x1b, 0x1b,
 };
 
-static const char *payload_msg =
+static const char payload_msg[] =
         "Hello world! This is an Efx loopback test in progress!";
 
 /**
@@ -79,10 +79,14 @@ struct efx_loopback_state {
 static int efx_test_mdio(struct efx_nic *efx, struct efx_self_tests *tests)
 {
         int rc = 0;
-        int devad = __ffs(efx->mdio.mmds);
+        int devad;
         u16 physid1, physid2;
 
-        if (efx->phy_type == PHY_TYPE_NONE)
+        if (efx->mdio.mode_support & MDIO_SUPPORTS_C45)
+                devad = __ffs(efx->mdio.mmds);
+        else if (efx->mdio.mode_support & MDIO_SUPPORTS_C22)
+                devad = MDIO_DEVAD_NONE;
+        else
                 return 0;
 
         mutex_lock(&efx->mac_lock);
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index de07a4f031b2..f8c6771e66d8 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -133,6 +133,7 @@ static int siena_probe_port(struct efx_nic *efx)
 
 void siena_remove_port(struct efx_nic *efx)
 {
+        efx->phy_op->remove(efx);
         efx_nic_free_buffer(efx, &efx->stats_buffer);
 }
 
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index ca11572a49a9..3009c297c135 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -202,10 +202,14 @@ static ssize_t set_phy_short_reach(struct device *dev,
         int rc;
 
         rtnl_lock();
-        efx_mdio_set_flag(efx, MDIO_MMD_PMAPMD, MDIO_PMA_10GBT_TXPWR,
-                          MDIO_PMA_10GBT_TXPWR_SHORT,
-                          count != 0 && *buf != '0');
-        rc = efx_reconfigure_port(efx);
+        if (efx->state != STATE_RUNNING) {
+                rc = -EBUSY;
+        } else {
+                efx_mdio_set_flag(efx, MDIO_MMD_PMAPMD, MDIO_PMA_10GBT_TXPWR,
+                                  MDIO_PMA_10GBT_TXPWR_SHORT,
+                                  count != 0 && *buf != '0');
+                rc = efx_reconfigure_port(efx);
+        }
         rtnl_unlock();
 
         return rc < 0 ? rc : (ssize_t)count;
@@ -298,36 +302,62 @@ static int tenxpress_init(struct efx_nic *efx)
         return 0;
 }
 
-static int sfx7101_phy_probe(struct efx_nic *efx)
+static int tenxpress_phy_probe(struct efx_nic *efx)
 {
-        efx->mdio.mmds = TENXPRESS_REQUIRED_DEVS;
-        efx->mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
-        efx->loopback_modes = SFX7101_LOOPBACKS | FALCON_XMAC_LOOPBACKS;
-        return 0;
-}
+        struct tenxpress_phy_data *phy_data;
+        int rc;
+
+        /* Allocate phy private storage */
+        phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);
+        if (!phy_data)
+                return -ENOMEM;
+        efx->phy_data = phy_data;
+        phy_data->phy_mode = efx->phy_mode;
+
+        /* Create any special files */
+        if (efx->phy_type == PHY_TYPE_SFT9001B) {
+                rc = device_create_file(&efx->pci_dev->dev,
+                                        &dev_attr_phy_short_reach);
+                if (rc)
+                        goto fail;
+        }
+
+        if (efx->phy_type == PHY_TYPE_SFX7101) {
+                efx->mdio.mmds = TENXPRESS_REQUIRED_DEVS;
+                efx->mdio.mode_support = MDIO_SUPPORTS_C45;
+
+                efx->loopback_modes = SFX7101_LOOPBACKS | FALCON_XMAC_LOOPBACKS;
+
+                efx->link_advertising = (ADVERTISED_TP | ADVERTISED_Autoneg |
+                                         ADVERTISED_10000baseT_Full);
+        } else {
+                efx->mdio.mmds = TENXPRESS_REQUIRED_DEVS;
+                efx->mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
+
+                efx->loopback_modes = (SFT9001_LOOPBACKS |
+                                       FALCON_XMAC_LOOPBACKS | 
+                                       FALCON_GMAC_LOOPBACKS);
+
+                efx->link_advertising = (ADVERTISED_TP | ADVERTISED_Autoneg |
+                                         ADVERTISED_10000baseT_Full |
+                                         ADVERTISED_1000baseT_Full |
+                                         ADVERTISED_100baseT_Full);
+        }
 
-static int sft9001_phy_probe(struct efx_nic *efx)
-{
-        efx->mdio.mmds = TENXPRESS_REQUIRED_DEVS;
-        efx->mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
-        efx->loopback_modes = (SFT9001_LOOPBACKS | FALCON_XMAC_LOOPBACKS |
-                               FALCON_GMAC_LOOPBACKS);
         return 0;
+
+fail:
+        kfree(efx->phy_data);
+        efx->phy_data = NULL;
+        return rc;
 }
 
 static int tenxpress_phy_init(struct efx_nic *efx)
 {
-        struct tenxpress_phy_data *phy_data;
-        int rc = 0;
+        int rc;
 
         falcon_board(efx)->type->init_phy(efx);
 
-        phy_data = kzalloc(sizeof(*phy_data), GFP_KERNEL);
-        if (!phy_data)
-                return -ENOMEM;
-        efx->phy_data = phy_data;
-        phy_data->phy_mode = efx->phy_mode;
-
         if (!(efx->phy_mode & PHY_MODE_SPECIAL)) {
                 if (efx->phy_type == PHY_TYPE_SFT9001A) {
                         int reg;
@@ -341,44 +371,27 @@ static int tenxpress_phy_init(struct efx_nic *efx)
 
                 rc = efx_mdio_wait_reset_mmds(efx, TENXPRESS_REQUIRED_DEVS);
                 if (rc < 0)
-                        goto fail;
+                        return rc;
 
                 rc = efx_mdio_check_mmds(efx, TENXPRESS_REQUIRED_DEVS, 0);
                 if (rc < 0)
-                        goto fail;
+                        return rc;
         }
 
         rc = tenxpress_init(efx);
         if (rc < 0)
-                goto fail;
+                return rc;
 
-        /* Initialise advertising flags */
-        efx->link_advertising = (ADVERTISED_TP | ADVERTISED_Autoneg |
-                                  ADVERTISED_10000baseT_Full);
-        if (efx->phy_type != PHY_TYPE_SFX7101)
-                efx->link_advertising |= (ADVERTISED_1000baseT_Full |
-                                           ADVERTISED_100baseT_Full);
+        /* Reinitialise flow control settings */
         efx_link_set_wanted_fc(efx, efx->wanted_fc);
         efx_mdio_an_reconfigure(efx);
 
-        if (efx->phy_type == PHY_TYPE_SFT9001B) {
-                rc = device_create_file(&efx->pci_dev->dev,
-                                        &dev_attr_phy_short_reach);
-                if (rc)
-                        goto fail;
-        }
-
         schedule_timeout_uninterruptible(HZ / 5); /* 200ms */
 
         /* Let XGXS and SerDes out of reset */
         falcon_reset_xaui(efx);
 
         return 0;
-
- fail:
-        kfree(efx->phy_data);
-        efx->phy_data = NULL;
-        return rc;
 }
 
 /* Perform a "special software reset" on the PHY. The caller is
@@ -589,25 +602,26 @@ static bool tenxpress_phy_poll(struct efx_nic *efx)
         return !efx_link_state_equal(&efx->link_state, &old_state);
 }
 
-static void tenxpress_phy_fini(struct efx_nic *efx)
+static void sfx7101_phy_fini(struct efx_nic *efx)
 {
         int reg;
 
+        /* Power down the LNPGA */
+        reg = (1 << PMA_PMD_LNPGA_POWERDOWN_LBN);
+        efx_mdio_write(efx, MDIO_MMD_PMAPMD, PMA_PMD_XCONTROL_REG, reg);
+
+        /* Waiting here ensures that the board fini, which can turn
+         * off the power to the PHY, won't get run until the LNPGA
+         * powerdown has been given long enough to complete. */
+        schedule_timeout_uninterruptible(LNPGA_PDOWN_WAIT); /* 200 ms */
+}
+
+static void tenxpress_phy_remove(struct efx_nic *efx)
+{
         if (efx->phy_type == PHY_TYPE_SFT9001B)
                 device_remove_file(&efx->pci_dev->dev,
                                    &dev_attr_phy_short_reach);
 
-        if (efx->phy_type == PHY_TYPE_SFX7101) {
-                /* Power down the LNPGA */
-                reg = (1 << PMA_PMD_LNPGA_POWERDOWN_LBN);
-                efx_mdio_write(efx, MDIO_MMD_PMAPMD, PMA_PMD_XCONTROL_REG, reg);
-
-                /* Waiting here ensures that the board fini, which can turn
-                 * off the power to the PHY, won't get run until the LNPGA
-                 * powerdown has been given long enough to complete. */
-                schedule_timeout_uninterruptible(LNPGA_PDOWN_WAIT); /* 200 ms */
-        }
-
         kfree(efx->phy_data);
         efx->phy_data = NULL;
 }
@@ -819,11 +833,12 @@ static void sft9001_set_npage_adv(struct efx_nic *efx, u32 advertising)
 }
 
 struct efx_phy_operations falcon_sfx7101_phy_ops = {
-        .probe            = sfx7101_phy_probe,
+        .probe            = tenxpress_phy_probe,
         .init             = tenxpress_phy_init,
         .reconfigure      = tenxpress_phy_reconfigure,
         .poll             = tenxpress_phy_poll,
-        .fini             = tenxpress_phy_fini,
+        .fini             = sfx7101_phy_fini,
+        .remove           = tenxpress_phy_remove,
         .get_settings     = tenxpress_get_settings,
         .set_settings     = tenxpress_set_settings,
         .set_npage_adv    = sfx7101_set_npage_adv,
@@ -832,11 +847,12 @@ struct efx_phy_operations falcon_sfx7101_phy_ops = {
 };
 
 struct efx_phy_operations falcon_sft9001_phy_ops = {
-        .probe            = sft9001_phy_probe,
+        .probe            = tenxpress_phy_probe,
         .init             = tenxpress_phy_init,
         .reconfigure      = tenxpress_phy_reconfigure,
         .poll             = tenxpress_phy_poll,
-        .fini             = tenxpress_phy_fini,
+        .fini             = efx_port_dummy_op_void,
+        .remove           = tenxpress_phy_remove,
         .get_settings     = tenxpress_get_settings,
         .set_settings     = tenxpress_set_settings,
         .set_npage_adv    = sft9001_set_npage_adv,
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index e669f94e821b..a8b70ef6d817 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -821,8 +821,6 @@ static void efx_enqueue_unwind(struct efx_tx_queue *tx_queue)
                                            EFX_TXQ_MASK];
                 efx_tsoh_free(tx_queue, buffer);
                 EFX_BUG_ON_PARANOID(buffer->skb);
-                buffer->len = 0;
-                buffer->continuation = true;
                 if (buffer->unmap_len) {
                         unmap_addr = (buffer->dma_addr + buffer->len -
                                       buffer->unmap_len);
@@ -836,6 +834,8 @@ static void efx_enqueue_unwind(struct efx_tx_queue *tx_queue)
                                                PCI_DMA_TODEVICE);
                         buffer->unmap_len = 0;
                 }
+                buffer->len = 0;
+                buffer->continuation = true;
         }
 }
 
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index c88bc1013047..7402b858cab7 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -84,6 +84,8 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .mpr            = 1,
         .tpauser        = 1,
         .hw_swap        = 1,
+        .rpadir         = 1,
+        .rpadir_value   = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */
 };
 
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
@@ -108,7 +110,7 @@ static void sh_eth_reset(struct net_device *ndev)
                 mdelay(1);
                 cnt--;
         }
-        if (cnt < 0)
+        if (cnt == 0)
                 printk(KERN_ERR "Device reset fail\n");
 
         /* Table Init */
@@ -175,7 +177,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .tpauser        = 1,
         .bculr          = 1,
         .hw_swap        = 1,
-        .rpadir         = 1,
         .no_trimd       = 1,
         .no_ade         = 1,
 };
@@ -501,6 +502,8 @@ static int sh_eth_ring_init(struct net_device *ndev)
          */
         mdp->rx_buf_sz = (ndev->mtu <= 1492 ? PKT_BUF_SZ :
                           (((ndev->mtu + 26 + 7) & ~7) + 2 + 16));
+        if (mdp->cd->rpadir)
+                mdp->rx_buf_sz += NET_IP_ALIGN;
 
         /* Allocate RX and TX skb rings */
         mdp->rx_skbuff = kmalloc(sizeof(*mdp->rx_skbuff) * RX_RING_SIZE,
@@ -715,6 +718,8 @@ static int sh_eth_rx(struct net_device *ndev)
                                         pkt_len + 2);
                         skb = mdp->rx_skbuff[entry];
                         mdp->rx_skbuff[entry] = NULL;
+                        if (mdp->cd->rpadir)
+                                skb_reserve(skb, NET_IP_ALIGN);
                         skb_put(skb, pkt_len);
                         skb->protocol = eth_type_trans(skb, ndev);
                         netif_rx(skb);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 89a05d674ddc..37f486b65f63 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -644,7 +644,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
 {
         u32 reg1;
 
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 &= ~phy_power[port];
 
@@ -652,7 +651,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
                 reg1 |= coma_mode[port];
 
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         sky2_pci_read32(hw, PCI_DEV_REG1);
 
         if (hw->chip_id == CHIP_ID_YUKON_FE)
@@ -709,11 +707,9 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)
                 gm_phy_write(hw, port, PHY_MARV_CTRL, PHY_CT_PDOWN);
         }
 
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 |= phy_power[port];                /* set PHY to PowerDown/COMA Mode */
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 }
 
 /* Force a renegotiation */
@@ -1848,7 +1844,8 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
         sky2->tx_cons = idx;
         smp_mb();
 
-        if (tx_avail(sky2) > MAX_SKB_TX_LE + 4)
+        /* Wake unless it's detached, and called e.g. from sky2_down() */
+        if (tx_avail(sky2) > MAX_SKB_TX_LE + 4 && netif_device_present(dev))
                 netif_wake_queue(dev);
 }
 
@@ -2152,9 +2149,7 @@ static void sky2_qlink_intr(struct sky2_hw *hw)
 
         /* reset PHY Link Detect */
         phy = sky2_pci_read16(hw, PSM_CONFIG_REG4);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         sky2_pci_write16(hw, PSM_CONFIG_REG4, phy | 1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
         sky2_link_up(sky2);
 }
@@ -2645,7 +2640,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
         if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                 u16 pci_err;
 
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 pci_err = sky2_pci_read16(hw, PCI_STATUS);
                 if (net_ratelimit())
                         dev_err(&pdev->dev, "PCI hardware error (0x%x)\n",
@@ -2653,14 +2647,12 @@ static void sky2_hw_intr(struct sky2_hw *hw)
 
                 sky2_pci_write16(hw, PCI_STATUS,
                                       pci_err | PCI_STATUS_ERROR_BITS);
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_IS_PCI_EXP) {
                 /* PCI-Express uncorrectable Error occurred */
                 u32 err;
 
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
                 sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
                              0xfffffffful);
@@ -2668,7 +2660,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
                         dev_err(&pdev->dev, "PCI Express error (0x%x)\n", err);
 
                 sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_HWE_L1_MASK)
@@ -3047,7 +3038,6 @@ static void sky2_reset(struct sky2_hw *hw)
         }
 
         sky2_power_on(hw);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
         for (i = 0; i < hw->ports; i++) {
                 sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
@@ -3084,7 +3074,6 @@ static void sky2_reset(struct sky2_hw *hw)
                 reg <<= PSM_CONFIG_REG4_TIMER_PHY_LINK_DETECT_BASE;
 
                 /* reset PHY Link Detect */
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 sky2_pci_write16(hw, PSM_CONFIG_REG4,
                                  reg | PSM_CONFIG_REG4_RST_PHY_LINK_DETECT);
                 sky2_pci_write16(hw, PSM_CONFIG_REG4, reg);
@@ -3102,7 +3091,6 @@ static void sky2_reset(struct sky2_hw *hw)
                         /* restore the PCIe Link Control register */
                         sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
                 }
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
                 /* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
                 sky2_write32(hw, Y2_PEX_PHY_DATA, PEX_DB_ACCESS | (0x08UL << 16));
@@ -4530,7 +4518,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
                 "Optima",       /* 0xbc */
         };
 
-        if (chipid >= CHIP_ID_YUKON_XL && chipid < CHIP_ID_YUKON_OPT)
+        if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OPT)
                 strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz);
         else
                 snprintf(buf, sz, "(chip %#x)", chipid);
@@ -4697,6 +4685,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
         INIT_WORK(&hw->restart_work, sky2_restart);
 
         pci_set_drvdata(pdev, hw);
+        pdev->d3_delay = 150;
 
         return 0;
 
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index 20d6095cf411..494cd91ea39c 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -2154,7 +2154,7 @@ static int smsc911x_resume(struct device *dev)
         return (to == 0) ? -EIO : 0;
 }
 
-static struct dev_pm_ops smsc911x_pm_ops = {
+static const struct dev_pm_ops smsc911x_pm_ops = {
         .suspend        = smsc911x_suspend,
         .resume         = smsc911x_resume,
 };
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 3a74d2168598..7f82b0238e08 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
  * Copyright (C) 2004 Sun Microsystems Inc.
- * Copyright (C) 2005-2009 Broadcom Corporation.
+ * Copyright (C) 2005-2010 Broadcom Corporation.
  *
  * Firmware is:
  *      Derived from proprietary unpublished source code,
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.105"
-#define DRV_MODULE_RELDATE      "December 2, 2009"
+#define DRV_MODULE_VERSION      "3.106"
+#define DRV_MODULE_RELDATE      "January 12, 2010"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -1037,7 +1037,11 @@ static void tg3_mdio_start(struct tg3 *tp)
                 else
                         tp->phy_addr = 1;
 
-                is_serdes = tr32(SG_DIG_STATUS) & SG_DIG_IS_SERDES;
+                if (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
+                        is_serdes = tr32(SG_DIG_STATUS) & SG_DIG_IS_SERDES;
+                else
+                        is_serdes = tr32(TG3_CPMU_PHY_STRAP) &
+                                    TG3_CPMU_PHY_STRAP_IS_SERDES;
                 if (is_serdes)
                         tp->phy_addr += 7;
         } else
@@ -4693,8 +4697,9 @@ next_pkt:
                 (*post_ptr)++;
 
                 if (unlikely(rx_std_posted >= tp->rx_std_max_post)) {
-                        u32 idx = *post_ptr % TG3_RX_RING_SIZE;
-                        tw32_rx_mbox(TG3_RX_STD_PROD_IDX_REG, idx);
+                        tpr->rx_std_prod_idx = std_prod_idx % TG3_RX_RING_SIZE;
+                        tw32_rx_mbox(TG3_RX_STD_PROD_IDX_REG,
+                                     tpr->rx_std_prod_idx);
                         work_mask &= ~RXD_OPAQUE_RING_STD;
                         rx_std_posted = 0;
                 }
@@ -7742,7 +7747,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
              ((u64) tpr->rx_std_mapping >> 32));
         tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
              ((u64) tpr->rx_std_mapping & 0xffffffff));
-        if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS))
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)
                 tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
                      NIC_SRAM_RX_BUFFER_DESC);
 
@@ -12122,7 +12127,8 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 
                 tp->phy_id = eeprom_phy_id;
                 if (eeprom_phy_serdes) {
-                        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+                        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) ||
+                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
                                 tp->tg3_flags2 |= TG3_FLG2_MII_SERDES;
                         else
                                 tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
@@ -13384,6 +13390,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (err)
                 return err;
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+            (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 ||
+                 (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
+                return -ENOTSUPP;
+
         /* Initialize data/descriptor byte/word swapping. */
         val = tr32(GRC_MODE);
         val &= GRC_MODE_HOST_STACKUP;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index cd30889650f8..8a167912902b 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -4,6 +4,7 @@
  * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com)
  * Copyright (C) 2004 Sun Microsystems Inc.
+ * Copyright (C) 2007-2010 Broadcom Corporation.
  */
 
 #ifndef _T3_H
@@ -1054,6 +1055,8 @@
 #define  CPMU_MUTEX_REQ_DRIVER           0x00001000
 #define TG3_CPMU_MUTEX_GNT              0x00003660
 #define  CPMU_MUTEX_GNT_DRIVER           0x00001000
+#define TG3_CPMU_PHY_STRAP              0x00003664
+#define TG3_CPMU_PHY_STRAP_IS_SERDES     0x00000020
 /* 0x3664 --> 0x3800 unused */
 
 /* Mbuf cluster free registers */
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 1cc8cf4425d1..516713fa0a05 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -101,6 +101,10 @@ config TULIP_NAPI_HW_MITIGATION
 
           If in doubt, say Y.
 
+config TULIP_DM910X
+        def_bool y
+        depends on TULIP && SPARC
+
 config DE4X5
         tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
         depends on PCI || EISA
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index ad63621913c3..6f44ebf58910 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -92,6 +92,10 @@
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 
+#ifdef CONFIG_TULIP_DM910X
+#include <linux/of.h>
+#endif
+
 
 /* Board/System/Debug information/definition ---------------- */
 #define PCI_DM9132_ID   0x91321282      /* Davicom DM9132 ID */
@@ -377,6 +381,23 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         if (!printed_version++)
                 printk(version);
 
+        /*
+         *      SPARC on-board DM910x chips should be handled by the main
+         *      tulip driver, except for early DM9100s.
+         */
+#ifdef CONFIG_TULIP_DM910X
+        if ((ent->driver_data == PCI_DM9100_ID && pdev->revision >= 0x30) ||
+            ent->driver_data == PCI_DM9102_ID) {
+                struct device_node *dp = pci_device_to_OF_node(pdev);
+
+                if (dp && of_get_property(dp, "local-mac-address", NULL)) {
+                        printk(KERN_INFO DRV_NAME
+                               ": skipping on-board DM910x (use tulip)\n");
+                        return -ENODEV;
+                }
+        }
+#endif
+
         /* Init network device */
         dev = alloc_etherdev(sizeof(*db));
         if (dev == NULL)
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 0fa3140d65bf..595777dcadb1 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -196,9 +196,13 @@ struct tulip_chip_table tulip_tbl[] = {
         | HAS_NWAY | HAS_PCI_MWI, tulip_timer, tulip_media_task },
 
   /* DM910X */
+#ifdef CONFIG_TULIP_DM910X
   { "Davicom DM9102/DM9102A", 128, 0x0001ebef,
         HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_ACPI,
         tulip_timer, tulip_media_task },
+#else
+  { NULL },
+#endif
 
   /* RS7112 */
   { "Conexant LANfinity", 256, 0x0001ebef,
@@ -228,8 +232,10 @@ static struct pci_device_id tulip_pci_tbl[] = {
         { 0x1259, 0xa120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 },
         { 0x8086, 0x0039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, I21145 },
+#ifdef CONFIG_TULIP_DM910X
         { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
         { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
+#endif
         { 0x1113, 0x1216, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { 0x1113, 0x1217, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 },
         { 0x1113, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
@@ -1299,18 +1305,30 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         }
 
         /*
-         *      Early DM9100's need software CRC and the DMFE driver
+         *      DM910x chips should be handled by the dmfe driver, except
+         *      on-board chips on SPARC systems.  Also, early DM9100s need
+         *      software CRC which only the dmfe driver supports.
          */
 
-        if (pdev->vendor == 0x1282 && pdev->device == 0x9100)
-        {
-                /* Read Chip revision */
-                if (pdev->revision < 0x30)
-                {
-                        printk(KERN_ERR PFX "skipping early DM9100 with Crc bug (use dmfe)\n");
+#ifdef CONFIG_TULIP_DM910X
+        if (chip_idx == DM910X) {
+                struct device_node *dp;
+
+                if (pdev->vendor == 0x1282 && pdev->device == 0x9100 &&
+                    pdev->revision < 0x30) {
+                        printk(KERN_INFO PFX
+                               "skipping early DM9100 with Crc bug (use dmfe)\n");
+                        return -ENODEV;
+                }
+
+                dp = pci_device_to_OF_node(pdev);
+                if (!(dp && of_get_property(dp, "local-mac-address", NULL))) {
+                        printk(KERN_INFO PFX
+                               "skipping DM910x expansion card (use dmfe)\n");
                         return -ENODEV;
                 }
         }
+#endif
 
         /*
          *      Looks for early PCI chipsets where people report hangs
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 01e99f22210e..2834a01bae24 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -849,13 +849,13 @@ static void tun_sock_write_space(struct sock *sk)
         if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
                 wake_up_interruptible_sync(sk->sk_sleep);
 
-        tun = container_of(sk, struct tun_sock, sk)->tun;
+        tun = tun_sk(sk)->tun;
         kill_fasync(&tun->fasync, SIGIO, POLL_OUT);
 }
 
 static void tun_sock_destruct(struct sock *sk)
 {
-        free_netdev(container_of(sk, struct tun_sock, sk)->tun->dev);
+        free_netdev(tun_sk(sk)->tun->dev);
 }
 
 static struct proto tun_proto = {
@@ -990,7 +990,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                 sk->sk_write_space = tun_sock_write_space;
                 sk->sk_sndbuf = INT_MAX;
 
-                container_of(sk, struct tun_sock, sk)->tun = tun;
+                tun_sk(sk)->tun = tun;
 
                 security_tun_dev_post_create(sk);
 
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index afaf088b72ea..96bdc0b43889 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -1563,7 +1563,10 @@ static int ugeth_disable(struct ucc_geth_private *ugeth, enum comm_dir mode)
 
 static void ugeth_quiesce(struct ucc_geth_private *ugeth)
 {
-        /* Wait for and prevent any further xmits. */
+        /* Prevent any further xmits, plus detach the device. */
+        netif_device_detach(ugeth->ndev);
+
+        /* Wait for any current xmits to finish. */
         netif_tx_disable(ugeth->ndev);
 
         /* Disable the interrupt to avoid NAPI rescheduling. */
@@ -1577,7 +1580,7 @@ static void ugeth_activate(struct ucc_geth_private *ugeth)
 {
         napi_enable(&ugeth->napi);
         enable_irq(ugeth->ug_info->uf_info.irq);
-        netif_tx_wake_all_queues(ugeth->ndev);
+        netif_device_attach(ugeth->ndev);
 }
 
 /* Called every time the controller might need to be made
@@ -1648,25 +1651,28 @@ static void adjust_link(struct net_device *dev)
                         ugeth->oldspeed = phydev->speed;
                 }
 
-                /*
-                 * To change the MAC configuration we need to disable the
-                 * controller. To do so, we have to either grab ugeth->lock,
-                 * which is a bad idea since 'graceful stop' commands might
-                 * take quite a while, or we can quiesce driver's activity.
-                 */
-                ugeth_quiesce(ugeth);
-                ugeth_disable(ugeth, COMM_DIR_RX_AND_TX);
-
-                out_be32(&ug_regs->maccfg2, tempval);
-                out_be32(&uf_regs->upsmr, upsmr);
-
-                ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);
-                ugeth_activate(ugeth);
-
                 if (!ugeth->oldlink) {
                         new_state = 1;
                         ugeth->oldlink = 1;
                 }
+
+                if (new_state) {
+                        /*
+                         * To change the MAC configuration we need to disable
+                         * the controller. To do so, we have to either grab
+                         * ugeth->lock, which is a bad idea since 'graceful
+                         * stop' commands might take quite a while, or we can
+                         * quiesce driver's activity.
+                         */
+                        ugeth_quiesce(ugeth);
+                        ugeth_disable(ugeth, COMM_DIR_RX_AND_TX);
+
+                        out_be32(&ug_regs->maccfg2, tempval);
+                        out_be32(&uf_regs->upsmr, upsmr);
+
+                        ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);
+                        ugeth_activate(ugeth);
+                }
         } else if (ugeth->oldlink) {
                         new_state = 1;
                         ugeth->oldlink = 0;
@@ -3273,7 +3279,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
                 /* Handle the transmitted buffer and release */
                 /* the BD to be used with the current frame  */
 
-                if ((bd == ugeth->txBd[txQ]) && (netif_queue_stopped(dev) == 0))
+                if (bd == ugeth->txBd[txQ]) /* queue empty? */
                         break;
 
                 dev->stats.tx_packets++;
@@ -3601,6 +3607,7 @@ static int ucc_geth_suspend(struct of_device *ofdev, pm_message_t state)
         if (!netif_running(ndev))
                 return 0;
 
+        netif_device_detach(ndev);
         napi_disable(&ugeth->napi);
 
         /*
@@ -3659,7 +3666,7 @@ static int ucc_geth_resume(struct of_device *ofdev)
         phy_start(ugeth->phydev);
 
         napi_enable(&ugeth->napi);
-        netif_start_queue(ndev);
+        netif_device_attach(ndev);
 
         return 0;
 }
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index a007e2acf651..ef1fbeb11c6e 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -838,13 +838,13 @@ struct ucc_geth_hardware_statistics {
                                                            using the maximum is
                                                            easier */
 #define UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT  32
-#define UCC_GETH_SCHEDULER_ALIGNMENT            4       /* This is a guess */
+#define UCC_GETH_SCHEDULER_ALIGNMENT            8       /* This is a guess */
 #define UCC_GETH_TX_STATISTICS_ALIGNMENT        4       /* This is a guess */
 #define UCC_GETH_RX_STATISTICS_ALIGNMENT        4       /* This is a guess */
 #define UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT      64
 #define UCC_GETH_RX_BD_QUEUES_ALIGNMENT         8       /* This is a guess */
 #define UCC_GETH_RX_PREFETCHED_BDS_ALIGNMENT    128     /* This is a guess */
-#define UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT 4    /* This
+#define UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT 8    /* This
                                                                            is a
                                                                            guess
                                                                          */
@@ -899,16 +899,17 @@ struct ucc_geth_hardware_statistics {
 #define UCC_GETH_UTFS_INIT                      512     /* Tx virtual FIFO size
                                                          */
 #define UCC_GETH_UTFET_INIT                     256     /* 1/2 utfs */
-#define UCC_GETH_UTFTT_INIT                     128
+#define UCC_GETH_UTFTT_INIT                     512
 /* Gigabit Ethernet (1000 Mbps) */
 #define UCC_GETH_URFS_GIGA_INIT                 4096/*2048*/    /* Rx virtual
                                                                    FIFO size */
 #define UCC_GETH_URFET_GIGA_INIT                2048/*1024*/    /* 1/2 urfs */
 #define UCC_GETH_URFSET_GIGA_INIT               3072/*1536*/    /* 3/4 urfs */
-#define UCC_GETH_UTFS_GIGA_INIT                 8192/*2048*/    /* Tx virtual
+#define UCC_GETH_UTFS_GIGA_INIT                 4096/*2048*/    /* Tx virtual
+                                                                   FIFO size */
+#define UCC_GETH_UTFET_GIGA_INIT                2048/*1024*/    /* 1/2 utfs */
+#define UCC_GETH_UTFTT_GIGA_INIT                4096/*0x40*/    /* Tx virtual
                                                                    FIFO size */
-#define UCC_GETH_UTFET_GIGA_INIT                4096/*1024*/    /* 1/2 utfs */
-#define UCC_GETH_UTFTT_GIGA_INIT                0x400/*0x40*/   /* */
 
 #define UCC_GETH_REMODER_INIT                   0       /* bits that must be
                                                            set */
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index f78f0903b073..6895f1531238 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -286,6 +286,7 @@ struct hso_device {
         u8 usb_gone;
         struct work_struct async_get_intf;
         struct work_struct async_put_intf;
+        struct work_struct reset_device;
 
         struct usb_device *usb;
         struct usb_interface *interface;
@@ -332,7 +333,8 @@ static void hso_kick_transmit(struct hso_serial *serial);
 /* Helper functions */
 static int hso_mux_submit_intr_urb(struct hso_shared_int *mux_int,
                                    struct usb_device *usb, gfp_t gfp);
-static void log_usb_status(int status, const char *function);
+static void handle_usb_error(int status, const char *function,
+                             struct hso_device *hso_dev);
 static struct usb_endpoint_descriptor *hso_get_ep(struct usb_interface *intf,
                                                   int type, int dir);
 static int hso_get_mux_ports(struct usb_interface *intf, unsigned char *ports);
@@ -350,6 +352,7 @@ static void async_put_intf(struct work_struct *data);
 static int hso_put_activity(struct hso_device *hso_dev);
 static int hso_get_activity(struct hso_device *hso_dev);
 static void tiocmget_intr_callback(struct urb *urb);
+static void reset_device(struct work_struct *data);
 /*****************************************************************************/
 /* Helping functions                                                         */
 /*****************************************************************************/
@@ -461,10 +464,17 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0x7501)},           /* GTM 382 */
         {USB_DEVICE(0x0af0, 0x7601)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7701)},
+        {USB_DEVICE(0x0af0, 0x7706)},
         {USB_DEVICE(0x0af0, 0x7801)},
         {USB_DEVICE(0x0af0, 0x7901)},
+        {USB_DEVICE(0x0af0, 0x7A01)},
+        {USB_DEVICE(0x0af0, 0x7A05)},
         {USB_DEVICE(0x0af0, 0x8200)},
         {USB_DEVICE(0x0af0, 0x8201)},
+        {USB_DEVICE(0x0af0, 0x8300)},
+        {USB_DEVICE(0x0af0, 0x8302)},
+        {USB_DEVICE(0x0af0, 0x8304)},
+        {USB_DEVICE(0x0af0, 0x8400)},
         {USB_DEVICE(0x0af0, 0xd035)},
         {USB_DEVICE(0x0af0, 0xd055)},
         {USB_DEVICE(0x0af0, 0xd155)},
@@ -473,6 +483,8 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0xd157)},
         {USB_DEVICE(0x0af0, 0xd257)},
         {USB_DEVICE(0x0af0, 0xd357)},
+        {USB_DEVICE(0x0af0, 0xd058)},
+        {USB_DEVICE(0x0af0, 0xc100)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, hso_ids);
@@ -655,8 +667,8 @@ static void set_serial_by_index(unsigned index, struct hso_serial *serial)
         spin_unlock_irqrestore(&serial_table_lock, flags);
 }
 
-/* log a meaningful explanation of an USB status */
-static void log_usb_status(int status, const char *function)
+static void handle_usb_error(int status, const char *function,
+                             struct hso_device *hso_dev)
 {
         char *explanation;
 
@@ -685,10 +697,20 @@ static void log_usb_status(int status, const char *function)
         case -EMSGSIZE:
                 explanation = "internal error";
                 break;
+        case -EILSEQ:
+        case -EPROTO:
+        case -ETIME:
+        case -ETIMEDOUT:
+                explanation = "protocol error";
+                if (hso_dev)
+                        schedule_work(&hso_dev->reset_device);
+                break;
         default:
                 explanation = "unknown status";
                 break;
         }
+
+        /* log a meaningful explanation of an USB status */
         D1("%s: received USB status - %s (%d)", function, explanation, status);
 }
 
@@ -762,7 +784,7 @@ static void write_bulk_callback(struct urb *urb)
         /* log status, but don't act on it, we don't need to resubmit anything
          * anyhow */
         if (status)
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, odev->parent);
 
         hso_put_activity(odev->parent);
 
@@ -806,7 +828,7 @@ static netdev_tx_t hso_net_start_xmit(struct sk_buff *skb,
         result = usb_submit_urb(odev->mux_bulk_tx_urb, GFP_ATOMIC);
         if (result) {
                 dev_warn(&odev->parent->interface->dev,
-                        "failed mux_bulk_tx_urb %d", result);
+                        "failed mux_bulk_tx_urb %d\n", result);
                 net->stats.tx_errors++;
                 netif_start_queue(net);
         } else {
@@ -998,7 +1020,7 @@ static void read_bulk_callback(struct urb *urb)
 
         /* is al ok?  (Filip: Who's Al ?) */
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, odev->parent);
                 return;
         }
 
@@ -1019,7 +1041,8 @@ static void read_bulk_callback(struct urb *urb)
         if (odev->parent->port_spec & HSO_INFO_CRC_BUG) {
                 u32 rest;
                 u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
-                rest = urb->actual_length % odev->in_endp->wMaxPacketSize;
+                rest = urb->actual_length %
+                        le16_to_cpu(odev->in_endp->wMaxPacketSize);
                 if (((rest == 5) || (rest == 6)) &&
                     !memcmp(((u8 *) urb->transfer_buffer) +
                             urb->actual_length - 4, crc_check, 4)) {
@@ -1053,7 +1076,7 @@ static void read_bulk_callback(struct urb *urb)
         result = usb_submit_urb(urb, GFP_ATOMIC);
         if (result)
                 dev_warn(&odev->parent->interface->dev,
-                         "%s failed submit mux_bulk_rx_urb %d", __func__,
+                         "%s failed submit mux_bulk_rx_urb %d\n", __func__,
                          result);
 }
 
@@ -1207,7 +1230,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
                 D1("serial == NULL");
                 return;
         } else if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 return;
         }
 
@@ -1225,7 +1248,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
                         u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
                         rest =
                             urb->actual_length %
-                            serial->in_endp->wMaxPacketSize;
+                            le16_to_cpu(serial->in_endp->wMaxPacketSize);
                         if (((rest == 5) || (rest == 6)) &&
                             !memcmp(((u8 *) urb->transfer_buffer) +
                                     urb->actual_length - 4, crc_check, 4)) {
@@ -1513,7 +1536,7 @@ static void tiocmget_intr_callback(struct urb *urb)
         if (!serial)
                 return;
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 return;
         }
         tiocmget = serial->tiocmget;
@@ -1700,6 +1723,10 @@ static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
                 D1("no tty structures");
                 return -EINVAL;
         }
+
+        if ((serial->parent->port_spec & HSO_PORT_MASK) != HSO_PORT_MODEM)
+                return -EINVAL;
+
         if_num = serial->parent->interface->altsetting->desc.bInterfaceNumber;
 
         spin_lock_irqsave(&serial->serial_lock, flags);
@@ -1838,7 +1865,7 @@ static int mux_device_request(struct hso_serial *serial, u8 type, u16 port,
         result = usb_submit_urb(ctrl_urb, GFP_ATOMIC);
         if (result) {
                 dev_err(&ctrl_urb->dev->dev,
-                        "%s failed submit ctrl_urb %d type %d", __func__,
+                        "%s failed submit ctrl_urb %d type %d\n", __func__,
                         result, type);
                 return result;
         }
@@ -1888,7 +1915,7 @@ static void intr_callback(struct urb *urb)
 
         /* status check */
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, NULL);
                 return;
         }
         D4("\n--- Got intr callback 0x%02X ---", status);
@@ -1905,18 +1932,18 @@ static void intr_callback(struct urb *urb)
                         if (serial != NULL) {
                                 D1("Pending read interrupt on port %d\n", i);
                                 spin_lock(&serial->serial_lock);
-                                if (serial->rx_state == RX_IDLE) {
+                                if (serial->rx_state == RX_IDLE &&
+                                        serial->open_count > 0) {
                                         /* Setup and send a ctrl req read on
                                          * port i */
-                                if (!serial->rx_urb_filled[0]) {
+                                        if (!serial->rx_urb_filled[0]) {
                                                 serial->rx_state = RX_SENT;
                                                 hso_mux_serial_read(serial);
                                         } else
                                                 serial->rx_state = RX_PENDING;
-
                                 } else {
-                                        D1("Already pending a read on "
-                                           "port %d\n", i);
+                                        D1("Already a read pending on "
+                                           "port %d or port not open\n", i);
                                 }
                                 spin_unlock(&serial->serial_lock);
                         }
@@ -1958,7 +1985,7 @@ static void hso_std_serial_write_bulk_callback(struct urb *urb)
         tty = tty_kref_get(serial->tty);
         spin_unlock(&serial->serial_lock);
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 tty_kref_put(tty);
                 return;
         }
@@ -2014,7 +2041,7 @@ static void ctrl_callback(struct urb *urb)
         tty = tty_kref_get(serial->tty);
         spin_unlock(&serial->serial_lock);
         if (status) {
-                log_usb_status(status, __func__);
+                handle_usb_error(status, __func__, serial->parent);
                 tty_kref_put(tty);
                 return;
         }
@@ -2358,12 +2385,12 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
         serial->tx_data_length = tx_size;
         serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
         if (!serial->tx_data) {
-                dev_err(dev, "%s - Out of memory", __func__);
+                dev_err(dev, "%s - Out of memory\n", __func__);
                 goto exit;
         }
         serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
         if (!serial->tx_buffer) {
-                dev_err(dev, "%s - Out of memory", __func__);
+                dev_err(dev, "%s - Out of memory\n", __func__);
                 goto exit;
         }
 
@@ -2391,6 +2418,7 @@ static struct hso_device *hso_create_device(struct usb_interface *intf,
 
         INIT_WORK(&hso_dev->async_get_intf, async_get_intf);
         INIT_WORK(&hso_dev->async_put_intf, async_put_intf);
+        INIT_WORK(&hso_dev->reset_device, reset_device);
 
         return hso_dev;
 }
@@ -2831,13 +2859,14 @@ struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface)
 
         mux->shared_intr_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!mux->shared_intr_urb) {
-                dev_err(&interface->dev, "Could not allocate intr urb?");
+                dev_err(&interface->dev, "Could not allocate intr urb?\n");
                 goto exit;
         }
-        mux->shared_intr_buf = kzalloc(mux->intr_endp->wMaxPacketSize,
-                                       GFP_KERNEL);
+        mux->shared_intr_buf =
+                kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),
+                        GFP_KERNEL);
         if (!mux->shared_intr_buf) {
-                dev_err(&interface->dev, "Could not allocate intr buf?");
+                dev_err(&interface->dev, "Could not allocate intr buf?\n");
                 goto exit;
         }
 
@@ -3132,6 +3161,26 @@ out:
         return result;
 }
 
+static void reset_device(struct work_struct *data)
+{
+        struct hso_device *hso_dev =
+            container_of(data, struct hso_device, reset_device);
+        struct usb_device *usb = hso_dev->usb;
+        int result;
+
+        if (hso_dev->usb_gone) {
+                D1("No reset during disconnect\n");
+        } else {
+                result = usb_lock_device_for_reset(usb, hso_dev->interface);
+                if (result < 0)
+                        D1("unable to lock device for reset: %d\n", result);
+                else {
+                        usb_reset_device(usb);
+                        usb_unlock_device(usb);
+                }
+        }
+}
+
 static void hso_serial_ref_free(struct kref *ref)
 {
         struct hso_device *hso_dev = container_of(ref, struct hso_device, ref);
@@ -3232,13 +3281,13 @@ static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int,
                          usb_rcvintpipe(usb,
                                 shared_int->intr_endp->bEndpointAddress & 0x7F),
                          shared_int->shared_intr_buf,
-                         shared_int->intr_endp->wMaxPacketSize,
+                         1,
                          intr_callback, shared_int,
                          shared_int->intr_endp->bInterval);
 
         result = usb_submit_urb(shared_int->shared_intr_urb, gfp);
         if (result)
-                dev_warn(&usb->dev, "%s failed mux_intr_urb %d", __func__,
+                dev_warn(&usb->dev, "%s failed mux_intr_urb %d\n", __func__,
                         result);
 
         return result;
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index b091e20ca167..fd19db0d2504 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -270,7 +270,7 @@ static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
                 get_registers(dev, PHYCNT, 1, data);
         } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
 
-        if (i < MII_TIMEOUT) {
+        if (i <= MII_TIMEOUT) {
                 get_registers(dev, PHYDAT, 2, data);
                 *reg = data[0] | (data[1] << 8);
                 return 0;
@@ -295,7 +295,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
                 get_registers(dev, PHYCNT, 1, data);
         } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
 
-        if (i < MII_TIMEOUT)
+        if (i <= MII_TIMEOUT)
                 return 0;
         else
                 return 1;
@@ -324,7 +324,7 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
                 dbg("%02X:", netdev->dev_addr[i]);
         dbg("%02X\n", netdev->dev_addr[i]);
         /* Set the IDR registers. */
-        set_registers(dev, IDR, sizeof(netdev->dev_addr), netdev->dev_addr);
+        set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
 #ifdef EEPROM_WRITE
         {
         u8 cr;
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 593e01f64e9b..611b80435955 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -102,6 +102,7 @@ static const int multicast_filter_limit = 32;
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
 #include <linux/bitops.h>
+#include <linux/workqueue.h>
 #include <asm/processor.h>      /* Processor type for cache alignment. */
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -389,6 +390,7 @@ struct rhine_private {
         struct net_device *dev;
         struct napi_struct napi;
         spinlock_t lock;
+        struct work_struct reset_task;
 
         /* Frequently used values: keep some adjacent for cache effect. */
         u32 quirks;
@@ -407,6 +409,7 @@ struct rhine_private {
 static int  mdio_read(struct net_device *dev, int phy_id, int location);
 static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
 static int  rhine_open(struct net_device *dev);
+static void rhine_reset_task(struct work_struct *work);
 static void rhine_tx_timeout(struct net_device *dev);
 static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
                                   struct net_device *dev);
@@ -775,6 +778,8 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
         dev->irq = pdev->irq;
 
         spin_lock_init(&rp->lock);
+        INIT_WORK(&rp->reset_task, rhine_reset_task);
+
         rp->mii_if.dev = dev;
         rp->mii_if.mdio_read = mdio_read;
         rp->mii_if.mdio_write = mdio_write;
@@ -1179,22 +1184,18 @@ static int rhine_open(struct net_device *dev)
         return 0;
 }
 
-static void rhine_tx_timeout(struct net_device *dev)
+static void rhine_reset_task(struct work_struct *work)
 {
-        struct rhine_private *rp = netdev_priv(dev);
-        void __iomem *ioaddr = rp->base;
-
-        printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
-               "%4.4x, resetting...\n",
-               dev->name, ioread16(ioaddr + IntrStatus),
-               mdio_read(dev, rp->mii_if.phy_id, MII_BMSR));
+        struct rhine_private *rp = container_of(work, struct rhine_private,
+                                                reset_task);
+        struct net_device *dev = rp->dev;
 
         /* protect against concurrent rx interrupts */
         disable_irq(rp->pdev->irq);
 
         napi_disable(&rp->napi);
 
-        spin_lock(&rp->lock);
+        spin_lock_bh(&rp->lock);
 
         /* clear all descriptors */
         free_tbufs(dev);
@@ -1206,7 +1207,7 @@ static void rhine_tx_timeout(struct net_device *dev)
         rhine_chip_reset(dev);
         init_registers(dev);
 
-        spin_unlock(&rp->lock);
+        spin_unlock_bh(&rp->lock);
         enable_irq(rp->pdev->irq);
 
         dev->trans_start = jiffies;
@@ -1214,6 +1215,19 @@ static void rhine_tx_timeout(struct net_device *dev)
         netif_wake_queue(dev);
 }
 
+static void rhine_tx_timeout(struct net_device *dev)
+{
+        struct rhine_private *rp = netdev_priv(dev);
+        void __iomem *ioaddr = rp->base;
+
+        printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
+               "%4.4x, resetting...\n",
+               dev->name, ioread16(ioaddr + IntrStatus),
+               mdio_read(dev, rp->mii_if.phy_id, MII_BMSR));
+
+        schedule_work(&rp->reset_task);
+}
+
 static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
                                   struct net_device *dev)
 {
@@ -1830,10 +1844,11 @@ static int rhine_close(struct net_device *dev)
         struct rhine_private *rp = netdev_priv(dev);
         void __iomem *ioaddr = rp->base;
 
-        spin_lock_irq(&rp->lock);
-
-        netif_stop_queue(dev);
         napi_disable(&rp->napi);
+        cancel_work_sync(&rp->reset_task);
+        netif_stop_queue(dev);
+
+        spin_lock_irq(&rp->lock);
 
         if (debug > 1)
                 printk(KERN_DEBUG "%s: Shutting down ethercard, "
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 4ceb441f2687..c93f58f5c6f2 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2237,8 +2237,6 @@ static int velocity_open(struct net_device *dev)
         /* Ensure chip is running */
         pci_set_power_state(vptr->pdev, PCI_D0);
 
-        velocity_give_many_rx_descs(vptr);
-
         velocity_init_registers(vptr, VELOCITY_INIT_COLD);
 
         ret = request_irq(vptr->pdev->irq, velocity_intr, IRQF_SHARED,
@@ -2250,6 +2248,8 @@ static int velocity_open(struct net_device *dev)
                 goto out;
         }
 
+        velocity_give_many_rx_descs(vptr);
+
         mac_enable_int(vptr->mac_regs);
         netif_start_queue(dev);
         napi_enable(&vptr->napi);
@@ -2339,10 +2339,10 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu)
 
                 dev->mtu = new_mtu;
 
-                velocity_give_many_rx_descs(vptr);
-
                 velocity_init_registers(vptr, VELOCITY_INIT_COLD);
 
+                velocity_give_many_rx_descs(vptr);
+
                 mac_enable_int(vptr->mac_regs);
                 netif_start_queue(dev);
 
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 1ceb9d0f8b97..9cc438282d77 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2689,7 +2689,7 @@ vmxnet3_resume(struct device *device)
         return 0;
 }
 
-static struct dev_pm_ops vmxnet3_pm_ops = {
+static const struct dev_pm_ops vmxnet3_pm_ops = {
         .suspend = vmxnet3_suspend,
         .resume = vmxnet3_resume,
 };
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index f1c4b2a1e867..b9685e82f7b6 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -310,7 +310,7 @@ static int vxge_rx_map(void *dtrh, struct vxge_ring *ring)
         dma_addr = pci_map_single(ring->pdev, rx_priv->skb_data,
                                 rx_priv->data_size, PCI_DMA_FROMDEVICE);
 
-        if (dma_addr == 0) {
+        if (unlikely(pci_dma_mapping_error(ring->pdev, dma_addr))) {
                 ring->stats.pci_map_fail++;
                 return -EIO;
         }
@@ -4087,21 +4087,21 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit0;
         }
 
-        if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s : using 64bit DMA", __func__);
 
                 high_dma = 1;
 
                 if (pci_set_consistent_dma_mask(pdev,
-                                                0xffffffffffffffffULL)) {
+                                                DMA_BIT_MASK(64))) {
                         vxge_debug_init(VXGE_ERR,
                                 "%s : unable to obtain 64bit DMA for "
                                 "consistent allocations", __func__);
                         ret = -ENOMEM;
                         goto _exit1;
                 }
-        } else if (!pci_set_dma_mask(pdev, 0xffffffffUL)) {
+        } else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s : using 32bit DMA", __func__);
         } else {
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index a4c086f069b1..e63b7c40d0ee 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1903,17 +1903,6 @@ accept:
                 rxs->noise = sc->ah->ah_noise_floor;
                 rxs->signal = rxs->noise + rs.rs_rssi;
 
-                /* An rssi of 35 indicates you should be able use
-                 * 54 Mbps reliably. A more elaborate scheme can be used
-                 * here but it requires a map of SNR/throughput for each
-                 * possible mode used */
-                rxs->qual = rs.rs_rssi * 100 / 35;
-
-                /* rssi can be more than 35 though, anything above that
-                 * should be considered at 100% */
-                if (rxs->qual > 100)
-                        rxs->qual = 100;
-
                 rxs->antenna = rs.rs_antenna;
                 rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);
                 rxs->flag |= ath5k_rx_decrypted(sc, ds, skb, &rs);
@@ -2381,6 +2370,9 @@ ath5k_init(struct ath5k_softc *sc)
          */
         ath5k_stop_locked(sc);
 
+        /* Set PHY calibration interval */
+        ah->ah_cal_intval = ath5k_calinterval;
+
         /*
          * The basic interface to setting the hardware in a good
          * state is ``reset''.  On return the hardware is known to
@@ -2408,10 +2400,6 @@ ath5k_init(struct ath5k_softc *sc)
 
         /* Set ack to be sent at low bit-rates */
         ath5k_hw_set_ack_bitrate_high(ah, false);
-
-        /* Set PHY calibration inteval */
-        ah->ah_cal_intval = ath5k_calinterval;
-
         ret = 0;
 done:
         mmiowb();
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 5d1c8677f180..6a3f4da7fb48 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -97,7 +97,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
         int ret;
         u16 val;
-        u32 cksum, offset;
+        u32 cksum, offset, eep_max = AR5K_EEPROM_INFO_MAX;
 
         /*
          * Read values from EEPROM and store them in the capability structure
@@ -116,12 +116,38 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
          * Validate the checksum of the EEPROM date. There are some
          * devices with invalid EEPROMs.
          */
-        for (cksum = 0, offset = 0; offset < AR5K_EEPROM_INFO_MAX; offset++) {
+        AR5K_EEPROM_READ(AR5K_EEPROM_SIZE_UPPER, val);
+        if (val) {
+                eep_max = (val & AR5K_EEPROM_SIZE_UPPER_MASK) <<
+                           AR5K_EEPROM_SIZE_ENDLOC_SHIFT;
+                AR5K_EEPROM_READ(AR5K_EEPROM_SIZE_LOWER, val);
+                eep_max = (eep_max | val) - AR5K_EEPROM_INFO_BASE;
+
+                /*
+                 * Fail safe check to prevent stupid loops due
+                 * to busted EEPROMs. XXX: This value is likely too
+                 * big still, waiting on a better value.
+                 */
+                if (eep_max > (3 * AR5K_EEPROM_INFO_MAX)) {
+                        ATH5K_ERR(ah->ah_sc, "Invalid max custom EEPROM size: "
+                                  "%d (0x%04x) max expected: %d (0x%04x)\n",
+                                  eep_max, eep_max,
+                                  3 * AR5K_EEPROM_INFO_MAX,
+                                  3 * AR5K_EEPROM_INFO_MAX);
+                        return -EIO;
+                }
+        }
+
+        for (cksum = 0, offset = 0; offset < eep_max; offset++) {
                 AR5K_EEPROM_READ(AR5K_EEPROM_INFO(offset), val);
                 cksum ^= val;
         }
         if (cksum != AR5K_EEPROM_INFO_CKSUM) {
-                ATH5K_ERR(ah->ah_sc, "Invalid EEPROM checksum 0x%04x\n", cksum);
+                ATH5K_ERR(ah->ah_sc, "Invalid EEPROM "
+                          "checksum: 0x%04x eep_max: 0x%04x (%s)\n",
+                          cksum, eep_max,
+                          eep_max == AR5K_EEPROM_INFO_MAX ?
+                                "default size" : "custom size");
                 return -EIO;
         }
 
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.h b/drivers/net/wireless/ath/ath5k/eeprom.h
index 0123f3521a0b..473a483bb9c3 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.h
+++ b/drivers/net/wireless/ath/ath5k/eeprom.h
@@ -37,6 +37,14 @@
 #define AR5K_EEPROM_RFKILL_POLARITY_S   1
 
 #define AR5K_EEPROM_REG_DOMAIN          0x00bf  /* EEPROM regdom */
+
+/* FLASH(EEPROM) Defines for AR531X chips */
+#define AR5K_EEPROM_SIZE_LOWER          0x1b /* size info -- lower */
+#define AR5K_EEPROM_SIZE_UPPER          0x1c /* size info -- upper */
+#define AR5K_EEPROM_SIZE_UPPER_MASK     0xfff0
+#define AR5K_EEPROM_SIZE_UPPER_SHIFT    4
+#define AR5K_EEPROM_SIZE_ENDLOC_SHIFT   12
+
 #define AR5K_EEPROM_CHECKSUM            0x00c0  /* EEPROM checksum */
 #define AR5K_EEPROM_INFO_BASE           0x00c0  /* EEPROM header */
 #define AR5K_EEPROM_INFO_MAX            (0x400 - AR5K_EEPROM_INFO_BASE)
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index 03a1106ad725..5774cea23a3b 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -25,7 +25,7 @@ config ATH9K
 
 config ATH9K_DEBUGFS
         bool "Atheros ath9k debugging"
-        depends on ATH9K
+        depends on ATH9K && DEBUG_FS
         ---help---
           Say Y, if you need access to ath9k's statistics for
           interrupts, rate control, etc.
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index e2cef2ff5d8f..1597a42731ed 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -33,11 +33,11 @@ struct ath_node;
 
 /* Macro to expand scalars to 64-bit objects */
 
-#define ito64(x) (sizeof(x) == 8) ?                     \
+#define ito64(x) (sizeof(x) == 1) ?                     \
         (((unsigned long long int)(x)) & (0xff)) :      \
-        (sizeof(x) == 16) ?                             \
+        (sizeof(x) == 2) ?                              \
         (((unsigned long long int)(x)) & 0xffff) :      \
-        ((sizeof(x) == 32) ?                            \
+        ((sizeof(x) == 4) ?                             \
          (((unsigned long long int)(x)) & 0xffffffff) : \
          (unsigned long long int)(x))
 
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 71b84d91dcff..efc420cd42bf 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -186,7 +186,7 @@ bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q)
                 wait = wait_time;
                 while (ath9k_hw_numtxpending(ah, q)) {
                         if ((--wait) == 0) {
-                                ath_print(common, ATH_DBG_QUEUE,
+                                ath_print(common, ATH_DBG_FATAL,
                                           "Failed to stop TX DMA in 100 "
                                           "msec after killing last frame\n");
                                 break;
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 0c87771383f0..e185479e295e 100644
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -77,6 +77,9 @@
 #define ATH9K_TXERR_XTXOP          0x08
 #define ATH9K_TXERR_TIMER_EXPIRED  0x10
 #define ATH9K_TX_ACKED             0x20
+#define ATH9K_TXERR_MASK                                                \
+        (ATH9K_TXERR_XRETRY | ATH9K_TXERR_FILT | ATH9K_TXERR_FIFO |     \
+         ATH9K_TXERR_XTXOP | ATH9K_TXERR_TIMER_EXPIRED)
 
 #define ATH9K_TX_BA                0x01
 #define ATH9K_TX_PWRMGMT           0x02
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c48743452515..996eb90263cc 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1973,6 +1973,9 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
         struct ieee80211_hw *hw = sc->hw;
         int r;
 
+        /* Stop ANI */
+        del_timer_sync(&common->ani.timer);
+
         ath9k_hw_set_interrupts(ah, 0);
         ath_drain_all_txq(sc, retry_tx);
         ath_stoprecv(sc);
@@ -2014,6 +2017,9 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
                 }
         }
 
+        /* Start ANI */
+        ath_start_ani(common);
+
         return r;
 }
 
@@ -2508,6 +2514,9 @@ static void ath9k_stop(struct ieee80211_hw *hw)
                 return; /* another wiphy still in use */
         }
 
+        /* Ensure HW is awake when we try to shut it down. */
+        ath9k_ps_wakeup(sc);
+
         if (ah->btcoex_hw.enabled) {
                 ath9k_hw_btcoex_disable(ah);
                 if (ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)
@@ -2528,6 +2537,9 @@ static void ath9k_stop(struct ieee80211_hw *hw)
         /* disable HAL and put h/w to sleep */
         ath9k_hw_disable(ah);
         ath9k_hw_configpcipowersave(ah, 1, 1);
+        ath9k_ps_restore(sc);
+
+        /* Finally, put the chip in FULL SLEEP mode */
         ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP);
 
         sc->sc_flags |= SC_OP_INVALID;
@@ -2641,8 +2653,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
         if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) ||
             (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC) ||
             (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) {
+                ath9k_ps_wakeup(sc);
                 ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
                 ath_beacon_return(sc, avp);
+                ath9k_ps_restore(sc);
         }
 
         sc->sc_flags &= ~SC_OP_BEACONS;
@@ -3091,15 +3105,21 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_RX_STOP:
                 break;
         case IEEE80211_AMPDU_TX_START:
+                ath9k_ps_wakeup(sc);
                 ath_tx_aggr_start(sc, sta, tid, ssn);
                 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+                ath9k_ps_restore(sc);
                 break;
         case IEEE80211_AMPDU_TX_STOP:
+                ath9k_ps_wakeup(sc);
                 ath_tx_aggr_stop(sc, sta, tid);
                 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+                ath9k_ps_restore(sc);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
+                ath9k_ps_wakeup(sc);
                 ath_tx_aggr_resume(sc, sta, tid);
+                ath9k_ps_restore(sc);
                 break;
         default:
                 ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 5321f735e5a0..f7af5ea54753 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -96,7 +96,7 @@ static void ath_pci_bt_coex_prep(struct ath_common *common)
         pci_write_config_byte(pdev, ATH_PCIE_CAP_LINK_CTRL, aspm);
 }
 
-const static struct ath_bus_ops ath_pci_bus_ops = {
+static const struct ath_bus_ops ath_pci_bus_ops = {
         .read_cachesize = ath_pci_read_cachesize,
         .cleanup = ath_pci_cleanup,
         .eeprom_read = ath_pci_eeprom_read,
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 2a11cc57ceea..fa12b9060b0b 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1108,11 +1108,11 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
         if (npend) {
                 int r;
 
-                ath_print(common, ATH_DBG_XMIT,
+                ath_print(common, ATH_DBG_FATAL,
                           "Unable to stop TxDMA. Reset HAL!\n");
 
                 spin_lock_bh(&sc->sc_resetlock);
-                r = ath9k_hw_reset(ah, sc->sc_ah->curchan, true);
+                r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false);
                 if (r)
                         ath_print(common, ATH_DBG_FATAL,
                                   "Unable to reset hardware; reset status %d\n",
@@ -1414,17 +1414,9 @@ static void assign_aggr_tid_seqno(struct sk_buff *skb,
          * For HT capable stations, we save tidno for later use.
          * We also override seqno set by upper layer with the one
          * in tx aggregation state.
-         *
-         * If fragmentation is on, the sequence number is
-         * not overridden, since it has been
-         * incremented by the fragmentation routine.
-         *
-         * FIXME: check if the fragmentation threshold exceeds
-         * IEEE80211 max.
          */
         tid = ATH_AN_2_TID(an, bf->bf_tidno);
-        hdr->seq_ctrl = cpu_to_le16(tid->seq_next <<
-                        IEEE80211_SEQ_SEQ_SHIFT);
+        hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT);
         bf->bf_seqno = tid->seq_next;
         INCR(tid->seq_next, IEEE80211_SEQ_MAX);
 }
@@ -1636,7 +1628,8 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
                 bf->bf_keyix = ATH9K_TXKEYIX_INVALID;
         }
 
-        if (ieee80211_is_data_qos(fc) && (sc->sc_flags & SC_OP_TXAGGR))
+        if (ieee80211_is_data_qos(fc) && bf_isht(bf) &&
+            (sc->sc_flags & SC_OP_TXAGGR))
                 assign_aggr_tid_seqno(skb, bf);
 
         bf->bf_mpdu = skb;
@@ -1780,7 +1773,8 @@ void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        int hdrlen, padsize;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        int padpos, padsize;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct ath_tx_control txctl;
 
@@ -1792,7 +1786,6 @@ void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
          * BSSes.
          */
         if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
-                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
                 if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
                         sc->tx.seq_no += 0x10;
                 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
@@ -1800,9 +1793,9 @@ void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
         }
 
         /* Add the padding after the header if this is not already done */
-        hdrlen = ieee80211_get_hdrlen_from_skb(skb);
-        if (hdrlen & 3) {
-                padsize = hdrlen % 4;
+        padpos = ath9k_cmn_padpos(hdr->frame_control);
+        padsize = padpos & 3;
+        if (padsize && skb->len>padpos) {
                 if (skb_headroom(skb) < padsize) {
                         ath_print(common, ATH_DBG_XMIT,
                                   "TX CABQ padding failed\n");
@@ -1810,7 +1803,7 @@ void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
                         return;
                 }
                 skb_push(skb, padsize);
-                memmove(skb->data, skb->data + padsize, hdrlen);
+                memmove(skb->data, skb->data + padsize, padpos);
         }
 
         txctl.txq = sc->beacon.cabq;
@@ -1838,7 +1831,8 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
         struct ieee80211_hw *hw = sc->hw;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        int hdrlen, padsize;
+        struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
+        int padpos, padsize;
 
         ath_print(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
 
@@ -1853,14 +1847,14 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                 tx_info->flags |= IEEE80211_TX_STAT_ACK;
         }
 
-        hdrlen = ieee80211_get_hdrlen_from_skb(skb);
-        padsize = hdrlen & 3;
-        if (padsize && hdrlen >= 24) {
+        padpos = ath9k_cmn_padpos(hdr->frame_control);
+        padsize = padpos & 3;
+        if (padsize && skb->len>padpos+padsize) {
                 /*
                  * Remove MAC header padding before giving the frame back to
                  * mac80211.
                  */
-                memmove(skb->data + padsize, skb->data, hdrlen);
+                memmove(skb->data + padsize, skb->data, padpos);
                 skb_pull(skb, padsize);
         }
 
@@ -2078,7 +2072,7 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
                                 &txq->axq_q, lastbf->list.prev);
 
                 txq->axq_depth--;
-                txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_FILT);
+                txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_MASK);
                 txq->axq_tx_inprogress = false;
                 spin_unlock_bh(&txq->axq_lock);
 
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 027be275e035..88d1fd02d40a 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -383,160 +383,44 @@ static inline
         }
 }
 
-/* Check if a DMA region fits the device constraints.
- * Returns true, if the region is OK for usage with this device. */
-static inline bool b43_dma_address_ok(struct b43_dmaring *ring,
-                                      dma_addr_t addr, size_t size)
-{
-        switch (ring->type) {
-        case B43_DMA_30BIT:
-                if ((u64)addr + size > (1ULL << 30))
-                        return 0;
-                break;
-        case B43_DMA_32BIT:
-                if ((u64)addr + size > (1ULL << 32))
-                        return 0;
-                break;
-        case B43_DMA_64BIT:
-                /* Currently we can't have addresses beyond
-                 * 64bit in the kernel. */
-                break;
-        }
-        return 1;
-}
-
-#define is_4k_aligned(addr)     (((u64)(addr) & 0x0FFFull) == 0)
-#define is_8k_aligned(addr)     (((u64)(addr) & 0x1FFFull) == 0)
-
-static void b43_unmap_and_free_ringmem(struct b43_dmaring *ring, void *base,
-                                       dma_addr_t dmaaddr, size_t size)
-{
-        ssb_dma_unmap_single(ring->dev->dev, dmaaddr, size, DMA_TO_DEVICE);
-        free_pages((unsigned long)base, get_order(size));
-}
-
-static void * __b43_get_and_map_ringmem(struct b43_dmaring *ring,
-                                        dma_addr_t *dmaaddr, size_t size,
-                                        gfp_t gfp_flags)
-{
-        void *base;
-
-        base = (void *)__get_free_pages(gfp_flags, get_order(size));
-        if (!base)
-                return NULL;
-        memset(base, 0, size);
-        *dmaaddr = ssb_dma_map_single(ring->dev->dev, base, size,
-                                      DMA_TO_DEVICE);
-        if (ssb_dma_mapping_error(ring->dev->dev, *dmaaddr)) {
-                free_pages((unsigned long)base, get_order(size));
-                return NULL;
-        }
-
-        return base;
-}
-
-static void * b43_get_and_map_ringmem(struct b43_dmaring *ring,
-                                      dma_addr_t *dmaaddr, size_t size)
-{
-        void *base;
-
-        base = __b43_get_and_map_ringmem(ring, dmaaddr, size,
-                                         GFP_KERNEL);
-        if (!base) {
-                b43err(ring->dev->wl, "Failed to allocate or map pages "
-                       "for DMA ringmemory\n");
-                return NULL;
-        }
-        if (!b43_dma_address_ok(ring, *dmaaddr, size)) {
-                /* The memory does not fit our device constraints.
-                 * Retry with GFP_DMA set to get lower memory. */
-                b43_unmap_and_free_ringmem(ring, base, *dmaaddr, size);
-                base = __b43_get_and_map_ringmem(ring, dmaaddr, size,
-                                                 GFP_KERNEL | GFP_DMA);
-                if (!base) {
-                        b43err(ring->dev->wl, "Failed to allocate or map pages "
-                               "in the GFP_DMA region for DMA ringmemory\n");
-                        return NULL;
-                }
-                if (!b43_dma_address_ok(ring, *dmaaddr, size)) {
-                        b43_unmap_and_free_ringmem(ring, base, *dmaaddr, size);
-                        b43err(ring->dev->wl, "Failed to allocate DMA "
-                               "ringmemory that fits device constraints\n");
-                        return NULL;
-                }
-        }
-        /* We expect the memory to be 4k aligned, at least. */
-        if (B43_WARN_ON(!is_4k_aligned(*dmaaddr))) {
-                b43_unmap_and_free_ringmem(ring, base, *dmaaddr, size);
-                return NULL;
-        }
-
-        return base;
-}
-
 static int alloc_ringmemory(struct b43_dmaring *ring)
 {
-        unsigned int required;
-        void *base;
-        dma_addr_t dmaaddr;
-
-        /* There are several requirements to the descriptor ring memory:
-         * - The memory region needs to fit the address constraints for the
-         *   device (same as for frame buffers).
-         * - For 30/32bit DMA devices, the descriptor ring must be 4k aligned.
-         * - For 64bit DMA devices, the descriptor ring must be 8k aligned.
+        gfp_t flags = GFP_KERNEL;
+
+        /* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
+         * alignment and 8K buffers for 64-bit DMA with 8K alignment. Testing
+         * has shown that 4K is sufficient for the latter as long as the buffer
+         * does not cross an 8K boundary.
+         *
+         * For unknown reasons - possibly a hardware error - the BCM4311 rev
+         * 02, which uses 64-bit DMA, needs the ring buffer in very low memory,
+         * which accounts for the GFP_DMA flag below.
+         *
+         * The flags here must match the flags in free_ringmemory below!
          */
-
         if (ring->type == B43_DMA_64BIT)
-                required = ring->nr_slots * sizeof(struct b43_dmadesc64);
-        else
-                required = ring->nr_slots * sizeof(struct b43_dmadesc32);
-        if (B43_WARN_ON(required > 0x1000))
+                flags |= GFP_DMA;
+        ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
+                                                  B43_DMA_RINGMEMSIZE,
+                                                  &(ring->dmabase), flags);
+        if (!ring->descbase) {
+                b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
                 return -ENOMEM;
-
-        ring->alloc_descsize = 0x1000;
-        base = b43_get_and_map_ringmem(ring, &dmaaddr, ring->alloc_descsize);
-        if (!base)
-                return -ENOMEM;
-        ring->alloc_descbase = base;
-        ring->alloc_dmabase = dmaaddr;
-
-        if ((ring->type != B43_DMA_64BIT) || is_8k_aligned(dmaaddr)) {
-                /* We're on <=32bit DMA, or we already got 8k aligned memory.
-                 * That's all we need, so we're fine. */
-                ring->descbase = base;
-                ring->dmabase = dmaaddr;
-                return 0;
-        }
-        b43_unmap_and_free_ringmem(ring, base, dmaaddr, ring->alloc_descsize);
-
-        /* Ok, we failed at the 8k alignment requirement.
-         * Try to force-align the memory region now. */
-        ring->alloc_descsize = 0x2000;
-        base = b43_get_and_map_ringmem(ring, &dmaaddr, ring->alloc_descsize);
-        if (!base)
-                return -ENOMEM;
-        ring->alloc_descbase = base;
-        ring->alloc_dmabase = dmaaddr;
-
-        if (is_8k_aligned(dmaaddr)) {
-                /* We're already 8k aligned. That Ok, too. */
-                ring->descbase = base;
-                ring->dmabase = dmaaddr;
-                return 0;
         }
-        /* Force-align it to 8k */
-        ring->descbase = (void *)((u8 *)base + 0x1000);
-        ring->dmabase = dmaaddr + 0x1000;
-        B43_WARN_ON(!is_8k_aligned(ring->dmabase));
+        memset(ring->descbase, 0, B43_DMA_RINGMEMSIZE);
 
         return 0;
 }
 
 static void free_ringmemory(struct b43_dmaring *ring)
 {
-        b43_unmap_and_free_ringmem(ring, ring->alloc_descbase,
-                                   ring->alloc_dmabase, ring->alloc_descsize);
+        gfp_t flags = GFP_KERNEL;
+
+        if (ring->type == B43_DMA_64BIT)
+                flags |= GFP_DMA;
+
+        ssb_dma_free_consistent(ring->dev->dev, B43_DMA_RINGMEMSIZE,
+                                ring->descbase, ring->dmabase, flags);
 }
 
 /* Reset the RX DMA channel */
@@ -646,14 +530,29 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
         if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
                 return 1;
 
-        if (!b43_dma_address_ok(ring, addr, buffersize)) {
-                /* We can't support this address. Unmap it again. */
-                unmap_descbuffer(ring, addr, buffersize, dma_to_device);
-                return 1;
+        switch (ring->type) {
+        case B43_DMA_30BIT:
+                if ((u64)addr + buffersize > (1ULL << 30))
+                        goto address_error;
+                break;
+        case B43_DMA_32BIT:
+                if ((u64)addr + buffersize > (1ULL << 32))
+                        goto address_error;
+                break;
+        case B43_DMA_64BIT:
+                /* Currently we can't have addresses beyond
+                 * 64bit in the kernel. */
+                break;
         }
 
         /* The address is OK. */
         return 0;
+
+address_error:
+        /* We can't support this address. Unmap it again. */
+        unmap_descbuffer(ring, addr, buffersize, dma_to_device);
+
+        return 1;
 }
 
 static bool b43_rx_buffer_is_poisoned(struct b43_dmaring *ring, struct sk_buff *skb)
@@ -715,9 +614,6 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
         meta->dmaaddr = dmaaddr;
         ring->ops->fill_descriptor(ring, desc, dmaaddr,
                                    ring->rx_buffersize, 0, 0, 0);
-        ssb_dma_sync_single_for_device(ring->dev->dev,
-                                       ring->alloc_dmabase,
-                                       ring->alloc_descsize, DMA_TO_DEVICE);
 
         return 0;
 }
@@ -1354,9 +1250,6 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
         }
         /* Now transfer the whole frame. */
         wmb();
-        ssb_dma_sync_single_for_device(ring->dev->dev,
-                                       ring->alloc_dmabase,
-                                       ring->alloc_descsize, DMA_TO_DEVICE);
         ops->poke_tx(ring, next_slot(ring, slot));
         return 0;
 
diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h
index e607b392314c..f7ab37c4cdbc 100644
--- a/drivers/net/wireless/b43/dma.h
+++ b/drivers/net/wireless/b43/dma.h
@@ -157,6 +157,7 @@ struct b43_dmadesc_generic {
 } __attribute__ ((__packed__));
 
 /* Misc DMA constants */
+#define B43_DMA_RINGMEMSIZE             PAGE_SIZE
 #define B43_DMA0_RX_FRAMEOFFSET         30
 
 /* DMA engine tuning knobs */
@@ -246,12 +247,6 @@ struct b43_dmaring {
         /* The QOS priority assigned to this ring. Only used for TX rings.
          * This is the mac80211 "queue" value. */
         u8 queue_prio;
-        /* Pointers and size of the originally allocated and mapped memory
-         * region for the descriptor ring. */
-        void *alloc_descbase;
-        dma_addr_t alloc_dmabase;
-        unsigned int alloc_descsize;
-        /* Pointer to our wireless device. */
         struct b43_wldev *dev;
 #ifdef CONFIG_B43_DEBUG
         /* Maximum number of used slots. */
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 7da1dab933d9..234891d8cc10 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -681,19 +681,13 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv,
                 snr = rx_stats_sig_avg / rx_stats_noise_diff;
                 rx_status.noise = rx_status.signal -
                                         iwl3945_calc_db_from_ratio(snr);
-                rx_status.qual = iwl3945_calc_sig_qual(rx_status.signal,
-                                                         rx_status.noise);
-
-        /* If noise info not available, calculate signal quality indicator (%)
-         *   using just the dBm signal level. */
         } else {
                 rx_status.noise = priv->last_rx_noise;
-                rx_status.qual = iwl3945_calc_sig_qual(rx_status.signal, 0);
         }
 
 
-        IWL_DEBUG_STATS(priv, "Rssi %d noise %d qual %d sig_avg %d noise_diff %d\n",
-                        rx_status.signal, rx_status.noise, rx_status.qual,
+        IWL_DEBUG_STATS(priv, "Rssi %d noise %d sig_avg %d noise_diff %d\n",
+                        rx_status.signal, rx_status.noise,
                         rx_stats_sig_avg, rx_stats_noise_diff);
 
         header = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);
@@ -1835,8 +1829,7 @@ static int iwl3945_send_rxon_assoc(struct iwl_priv *priv)
                 rc = -EIO;
         }
 
-        priv->alloc_rxb_page--;
-        free_pages(cmd.reply_page, priv->hw_params.rx_page_order);
+        iwl_free_pages(priv, cmd.reply_page);
 
         return rc;
 }
@@ -2836,6 +2829,7 @@ static struct iwl_cfg iwl3945_bg_cfg = {
         .use_isr_legacy = true,
         .ht_greenfield_support = false,
         .led_compensation = 64,
+        .broken_powersave = true,
 };
 
 static struct iwl_cfg iwl3945_abg_cfg = {
@@ -2852,6 +2846,7 @@ static struct iwl_cfg iwl3945_abg_cfg = {
         .use_isr_legacy = true,
         .ht_greenfield_support = false,
         .led_compensation = 64,
+        .broken_powersave = true,
 };
 
 struct pci_device_id iwl3945_hw_card_ids[] = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index ecc23ec1f6a4..531fa125f5a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -222,7 +222,6 @@ struct iwl3945_ibss_seq {
  *
  *****************************************************************************/
 extern int iwl3945_calc_db_from_ratio(int sig_ratio);
-extern int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm);
 extern void iwl3945_rx_replenish(void *data);
 extern void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);
 extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 386513b601f5..9b4b8b5c7574 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -1204,7 +1204,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
         iwl4965_interpolate_chan(priv, channel, &ch_eeprom_info);
 
         /* calculate tx gain adjustment based on power supply voltage */
-        voltage = priv->calib_info->voltage;
+        voltage = le16_to_cpu(priv->calib_info->voltage);
         init_voltage = (s32)le32_to_cpu(priv->card_alive_init.voltage);
         voltage_compensation =
             iwl4965_get_voltage_compensation(voltage, init_voltage);
@@ -1961,7 +1961,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
         struct ieee80211_tx_info *info;
         struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
         u32  status = le32_to_cpu(tx_resp->u.status);
-        int tid = MAX_TID_COUNT;
+        int uninitialized_var(tid);
         int sta_id;
         int freed;
         u8 *qc = NULL;
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000-hw.h b/drivers/net/wireless/iwlwifi/iwl-5000-hw.h
index 4ef6804a455a..bc056e9ab85f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-5000-hw.h
@@ -92,11 +92,15 @@
 
 static inline s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)
 {
-        u16 *temp_calib = (u16 *)iwl_eeprom_query_addr(priv,
-                                                       EEPROM_5000_TEMPERATURE);
-        /* offset =  temperature -  voltage / coef */
-        s32 offset = (s32)(temp_calib[0] - temp_calib[1] / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);
-        return offset;
+        u16 temperature, voltage;
+        __le16 *temp_calib =
+                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_TEMPERATURE);
+
+        temperature = le16_to_cpu(temp_calib[0]);
+        voltage = le16_to_cpu(temp_calib[1]);
+
+        /* offset = temp - volt / coeff */
+        return (s32)(temperature - voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);
 }
 
 /* Fixed (non-configurable) rx data from phy */
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index e2f8615c8c9b..33a5866538e7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -333,14 +333,15 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv)
 static int iwl5000_set_Xtal_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_xtal_freq_cmd cmd;
-        u16 *xtal_calib = (u16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_XTAL);
+        __le16 *xtal_calib =
+                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_XTAL);
 
         cmd.hdr.op_code = IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD;
         cmd.hdr.first_group = 0;
         cmd.hdr.groups_num = 1;
         cmd.hdr.data_valid = 1;
-        cmd.cap_pin1 = (u8)xtal_calib[0];
-        cmd.cap_pin2 = (u8)xtal_calib[1];
+        cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]);
+        cmd.cap_pin2 = le16_to_cpu(xtal_calib[1]);
         return iwl_calib_set(&priv->calib_results[IWL_CALIB_XTAL],
                              (u8 *)&cmd, sizeof(cmd));
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index fe511cbf012e..b93e49158196 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -150,7 +150,7 @@ static s32 expected_tpt_mimo3_40MHz[4][IWL_RATE_COUNT] = {
 };
 
 /* mbps, mcs */
-const static struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {
+static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {
         {  "1", "BPSK DSSS"},
         {  "2", "QPSK DSSS"},
         {"5.5", "BPSK CCK"},
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b8377efb3ba7..1c9866daf815 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1842,7 +1842,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log)
         }
 
 #ifdef CONFIG_IWLWIFI_DEBUG
-        if (!(iwl_get_debug_level(priv) & IWL_DL_FW_ERRORS))
+        if (!(iwl_get_debug_level(priv) & IWL_DL_FW_ERRORS) && !full_log)
                 size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
                         ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;
 #else
@@ -3173,7 +3173,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
 
         priv->ibss_beacon = NULL;
 
-        spin_lock_init(&priv->lock);
         spin_lock_init(&priv->sta_lock);
         spin_lock_init(&priv->hcmd_lock);
 
@@ -3361,10 +3360,11 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 (unsigned long long) pci_resource_len(pdev, 0));
         IWL_DEBUG_INFO(priv, "pci_resource_base = %p\n", priv->hw_base);
 
-        /* this spin lock will be used in apm_ops.init and EEPROM access
+        /* these spin locks will be used in apm_ops.init and EEPROM access
          * we should init now
          */
         spin_lock_init(&priv->reg_lock);
+        spin_lock_init(&priv->lock);
         iwl_hw_detect(priv);
         IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s REV=0x%X\n",
                 priv->cfg->name, priv->hw_rev);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 574d36658702..5461f105bd2d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2344,6 +2344,21 @@ static void iwl_ht_conf(struct iwl_priv *priv,
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
+static inline void iwl_set_no_assoc(struct iwl_priv *priv)
+{
+        priv->assoc_id = 0;
+        iwl_led_disassociate(priv);
+        /*
+         * inform the ucode that there is no longer an
+         * association and that no more packets should be
+         * sent
+         */
+        priv->staging_rxon.filter_flags &=
+                ~RXON_FILTER_ASSOC_MSK;
+        priv->staging_rxon.assoc_id = 0;
+        iwlcore_commit_rxon(priv);
+}
+
 #define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
 void iwl_bss_info_changed(struct ieee80211_hw *hw,
                           struct ieee80211_vif *vif,
@@ -2475,20 +2490,8 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
                                         IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;
                         if (!iwl_is_rfkill(priv))
                                 priv->cfg->ops->lib->post_associate(priv);
-                } else {
-                        priv->assoc_id = 0;
-                        iwl_led_disassociate(priv);
-
-                        /*
-                         * inform the ucode that there is no longer an
-                         * association and that no more packets should be
-                         * send
-                         */
-                        priv->staging_rxon.filter_flags &=
-                                ~RXON_FILTER_ASSOC_MSK;
-                        priv->staging_rxon.assoc_id = 0;
-                        iwlcore_commit_rxon(priv);
-                }
+                } else
+                        iwl_set_no_assoc(priv);
         }
 
         if (changes && iwl_is_associated(priv) && priv->assoc_id) {
@@ -2503,12 +2506,14 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
                 }
         }
 
-        if ((changes & BSS_CHANGED_BEACON_ENABLED) &&
-            vif->bss_conf.enable_beacon) {
-                memcpy(priv->staging_rxon.bssid_addr,
-                       bss_conf->bssid, ETH_ALEN);
-                memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
-                iwlcore_config_ap(priv);
+        if (changes & BSS_CHANGED_BEACON_ENABLED) {
+                if (vif->bss_conf.enable_beacon) {
+                        memcpy(priv->staging_rxon.bssid_addr,
+                               bss_conf->bssid, ETH_ALEN);
+                        memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
+                        iwlcore_config_ap(priv);
+                } else
+                        iwl_set_no_assoc(priv);
         }
 
         mutex_unlock(&priv->mutex);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 675b7df632fc..27ca859e7453 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -63,7 +63,7 @@
 #ifndef __iwl_core_h__
 #define __iwl_core_h__
 
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 
 /************************
  * forward declarations *
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index a7bfae01f19b..1ec8cb4d5eae 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -77,8 +77,7 @@
  * The MAC (uCode processor, etc.) does not need to be powered up for accessing
  * the CSR registers.
  *
- * NOTE:  Newer devices using one-time-programmable (OTP) memory
- *        require device to be awake in order to read this memory
+ * NOTE:  Device does need to be awake in order to read this memory
  *        via CSR_EEPROM and CSR_OTP registers
  */
 #define CSR_BASE    (0x000)
@@ -111,9 +110,8 @@
 /*
  * EEPROM and OTP (one-time-programmable) memory reads
  *
- * NOTE:  For (newer) devices using OTP, device must be awake, initialized via
- *        apm_ops.init() in order to read.  Older devices (3945/4965/5000)
- *        use EEPROM and do not require this.
+ * NOTE:  Device must be awake, initialized via apm_ops.init(),
+ *        in order to read.
  */
 #define CSR_EEPROM_REG          (CSR_BASE+0x02c)
 #define CSR_EEPROM_GP           (CSR_BASE+0x030)
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 2673e9a4db92..3822cf53e368 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -711,7 +711,7 @@ extern void iwl_txq_ctx_stop(struct iwl_priv *priv);
 extern int iwl_queue_space(const struct iwl_queue *q);
 static inline int iwl_queue_used(const struct iwl_queue *q, int i)
 {
-        return q->write_ptr > q->read_ptr ?
+        return q->write_ptr >= q->read_ptr ?
                 (i >= q->read_ptr && i < q->write_ptr) :
                 !(i < q->read_ptr && i >= q->write_ptr);
 }
@@ -1168,7 +1168,7 @@ struct iwl_priv {
         u32 last_beacon_time;
         u64 last_tsf;
 
-        /* eeprom */
+        /* eeprom -- this is in the card's little endian byte order */
         u8 *eeprom;
         int    nvm_device_type;
         struct iwl_eeprom_calib_info *calib_info;
@@ -1353,4 +1353,15 @@ static inline int is_channel_ibss(const struct iwl_channel_info *ch)
         return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
 }
 
+static inline void __iwl_free_pages(struct iwl_priv *priv, struct page *page)
+{
+        __free_pages(page, priv->hw_params.rx_page_order);
+        priv->alloc_rxb_page--;
+}
+
+static inline void iwl_free_pages(struct iwl_priv *priv, unsigned long page)
+{
+        free_pages(page, priv->hw_params.rx_page_order);
+        priv->alloc_rxb_page--;
+}
 #endif                          /* __iwl_dev_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 3946e5c03f81..4a30969689ff 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -370,7 +370,7 @@ static int iwl_init_otp_access(struct iwl_priv *priv)
         return ret;
 }
 
-static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, u16 *eeprom_data)
+static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, __le16 *eeprom_data)
 {
         int ret = 0;
         u32 r;
@@ -404,7 +404,7 @@ static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, u16 *eeprom_data)
                                 CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
                 IWL_ERR(priv, "Correctable OTP ECC error, continue read\n");
         }
-        *eeprom_data = le16_to_cpu((__force __le16)(r >> 16));
+        *eeprom_data = cpu_to_le16(r >> 16);
         return 0;
 }
 
@@ -413,7 +413,8 @@ static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, u16 *eeprom_data)
  */
 static bool iwl_is_otp_empty(struct iwl_priv *priv)
 {
-        u16 next_link_addr = 0, link_value;
+        u16 next_link_addr = 0;
+        __le16 link_value;
         bool is_empty = false;
 
         /* locate the beginning of OTP link list */
@@ -443,7 +444,8 @@ static bool iwl_is_otp_empty(struct iwl_priv *priv)
 static int iwl_find_otp_image(struct iwl_priv *priv,
                                         u16 *validblockaddr)
 {
-        u16 next_link_addr = 0, link_value = 0, valid_addr;
+        u16 next_link_addr = 0, valid_addr;
+        __le16 link_value = 0;
         int usedblocks = 0;
 
         /* set addressing mode to absolute to traverse the link list */
@@ -463,7 +465,7 @@ static int iwl_find_otp_image(struct iwl_priv *priv,
                  * check for more block on the link list
                  */
                 valid_addr = next_link_addr;
-                next_link_addr = link_value * sizeof(u16);
+                next_link_addr = le16_to_cpu(link_value) * sizeof(u16);
                 IWL_DEBUG_INFO(priv, "OTP blocks %d addr 0x%x\n",
                                usedblocks, next_link_addr);
                 if (iwl_read_otp_word(priv, next_link_addr, &link_value))
@@ -497,7 +499,7 @@ static int iwl_find_otp_image(struct iwl_priv *priv,
  */
 int iwl_eeprom_init(struct iwl_priv *priv)
 {
-        u16 *e;
+        __le16 *e;
         u32 gp = iwl_read32(priv, CSR_EEPROM_GP);
         int sz;
         int ret;
@@ -516,12 +518,9 @@ int iwl_eeprom_init(struct iwl_priv *priv)
                 ret = -ENOMEM;
                 goto alloc_err;
         }
-        e = (u16 *)priv->eeprom;
+        e = (__le16 *)priv->eeprom;
 
-        if (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP) {
-                /* OTP reads require powered-up chip */
-                priv->cfg->ops->lib->apm_ops.init(priv);
-        }
+        priv->cfg->ops->lib->apm_ops.init(priv);
 
         ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv);
         if (ret < 0) {
@@ -562,7 +561,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)
                 }
                 for (addr = validblockaddr; addr < validblockaddr + sz;
                      addr += sizeof(u16)) {
-                        u16 eeprom_data;
+                        __le16 eeprom_data;
 
                         ret = iwl_read_otp_word(priv, addr, &eeprom_data);
                         if (ret)
@@ -570,13 +569,6 @@ int iwl_eeprom_init(struct iwl_priv *priv)
                         e[cache_addr / 2] = eeprom_data;
                         cache_addr += sizeof(u16);
                 }
-
-                /*
-                 * Now that OTP reads are complete, reset chip to save
-                 *   power until we load uCode during "up".
-                 */
-                priv->cfg->ops->lib->apm_ops.stop(priv);
-
         } else {
                 /* eeprom is an array of 16bit values */
                 for (addr = 0; addr < sz; addr += sizeof(u16)) {
@@ -594,7 +586,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)
                                 goto done;
                         }
                         r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
-                        e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
+                        e[addr / 2] = cpu_to_le16(r >> 16);
                 }
         }
         ret = 0;
@@ -603,6 +595,8 @@ done:
 err:
         if (ret)
                 iwl_eeprom_free(priv);
+        /* Reset chip to save power until we load uCode during "up". */
+        priv->cfg->ops->lib->apm_ops.stop(priv);
 alloc_err:
         return ret;
 }
@@ -755,7 +749,8 @@ static int iwl_mod_ht40_chan_info(struct iwl_priv *priv,
         ch_info->ht40_eeprom = *eeprom_ch;
         ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg;
         ch_info->ht40_flags = eeprom_ch->flags;
-        ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel;
+        if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)
+                ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel;
 
         return 0;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 5cd2b66bbe45..0cd9c02ee044 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -137,7 +137,7 @@ struct iwl_eeprom_channel {
  *
  */
 struct iwl_eeprom_enhanced_txpwr {
-        u16 common;
+        __le16 common;
         s8 chain_a_max;
         s8 chain_b_max;
         s8 chain_c_max;
@@ -360,7 +360,7 @@ struct iwl_eeprom_calib_subband_info {
 struct iwl_eeprom_calib_info {
         u8 saturation_power24;  /* half-dBm (e.g. "34" = 17 dBm) */
         u8 saturation_power52;  /* half-dBm */
-        s16 voltage;            /* signed */
+        __le16 voltage;         /* signed */
         struct iwl_eeprom_calib_subband_info
                 band_info[EEPROM_TX_POWER_BANDS];
 } __attribute__ ((packed));
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index a23165948202..30e9ea6d54ec 100644
--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -234,7 +234,7 @@ cancel:
         }
 fail:
         if (cmd->reply_page) {
-                free_pages(cmd->reply_page, priv->hw_params.rx_page_order);
+                iwl_free_pages(priv, cmd->reply_page);
                 cmd->reply_page = 0;
         }
 out:
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index 6090bc15a6d5..6f36b6e79f5e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -345,10 +345,8 @@ void iwl_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
                         pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
                                 PAGE_SIZE << priv->hw_params.rx_page_order,
                                 PCI_DMA_FROMDEVICE);
-                        __free_pages(rxq->pool[i].page,
-                                     priv->hw_params.rx_page_order);
+                        __iwl_free_pages(priv, rxq->pool[i].page);
                         rxq->pool[i].page = NULL;
-                        priv->alloc_rxb_page--;
                 }
         }
 
@@ -416,9 +414,7 @@ void iwl_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
                         pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
                                 PAGE_SIZE << priv->hw_params.rx_page_order,
                                 PCI_DMA_FROMDEVICE);
-                        priv->alloc_rxb_page--;
-                        __free_pages(rxq->pool[i].page,
-                                     priv->hw_params.rx_page_order);
+                        __iwl_free_pages(priv, rxq->pool[i].page);
                         rxq->pool[i].page = NULL;
                 }
                 list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
@@ -654,47 +650,6 @@ void iwl_reply_statistics(struct iwl_priv *priv,
 }
 EXPORT_SYMBOL(iwl_reply_statistics);
 
-#define PERFECT_RSSI (-20) /* dBm */
-#define WORST_RSSI (-95)   /* dBm */
-#define RSSI_RANGE (PERFECT_RSSI - WORST_RSSI)
-
-/* Calculate an indication of rx signal quality (a percentage, not dBm!).
- * See http://www.ces.clemson.edu/linux/signal_quality.shtml for info
- *   about formulas used below. */
-static int iwl_calc_sig_qual(int rssi_dbm, int noise_dbm)
-{
-        int sig_qual;
-        int degradation = PERFECT_RSSI - rssi_dbm;
-
-        /* If we get a noise measurement, use signal-to-noise ratio (SNR)
-         * as indicator; formula is (signal dbm - noise dbm).
-         * SNR at or above 40 is a great signal (100%).
-         * Below that, scale to fit SNR of 0 - 40 dB within 0 - 100% indicator.
-         * Weakest usable signal is usually 10 - 15 dB SNR. */
-        if (noise_dbm) {
-                if (rssi_dbm - noise_dbm >= 40)
-                        return 100;
-                else if (rssi_dbm < noise_dbm)
-                        return 0;
-                sig_qual = ((rssi_dbm - noise_dbm) * 5) / 2;
-
-        /* Else use just the signal level.
-         * This formula is a least squares fit of data points collected and
-         *   compared with a reference system that had a percentage (%) display
-         *   for signal quality. */
-        } else
-                sig_qual = (100 * (RSSI_RANGE * RSSI_RANGE) - degradation *
-                            (15 * RSSI_RANGE + 62 * degradation)) /
-                           (RSSI_RANGE * RSSI_RANGE);
-
-        if (sig_qual > 100)
-                sig_qual = 100;
-        else if (sig_qual < 1)
-                sig_qual = 0;
-
-        return sig_qual;
-}
-
 /* Calc max signal level (dBm) among 3 possible receivers */
 static inline int iwl_calc_rssi(struct iwl_priv *priv,
                                 struct iwl_rx_phy_res *rx_resp)
@@ -1105,11 +1060,8 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
         if (iwl_is_associated(priv) &&
             !test_bit(STATUS_SCANNING, &priv->status)) {
                 rx_status.noise = priv->last_rx_noise;
-                rx_status.qual = iwl_calc_sig_qual(rx_status.signal,
-                                                         rx_status.noise);
         } else {
                 rx_status.noise = IWL_NOISE_MEAS_NOT_AVAILABLE;
-                rx_status.qual = iwl_calc_sig_qual(rx_status.signal, 0);
         }
 
         /* Reset beacon noise level if not associated. */
@@ -1122,8 +1074,8 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
                 iwl_dbg_report_frame(priv, phy_res, len, header, 1);
 #endif
         iwl_dbg_log_rx_data_frame(priv, len, header);
-        IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, noise %d, qual %d, TSF %llu\n",
-                rx_status.signal, rx_status.noise, rx_status.qual,
+        IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, noise %d, TSF %llu\n",
+                rx_status.signal, rx_status.noise,
                 (unsigned long long)rx_status.mactime);
 
         /*
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index a2b2b8315ff9..fa1c89ba6459 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -144,8 +144,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv)
                 clear_bit(STATUS_SCAN_HW, &priv->status);
         }
 
-        priv->alloc_rxb_page--;
-        free_pages(cmd.reply_page, priv->hw_params.rx_page_order);
+        iwl_free_pages(priv, cmd.reply_page);
 
         return ret;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index cd6a6901216e..cde09a890b73 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -164,9 +164,7 @@ int iwl_send_add_sta(struct iwl_priv *priv,
                         break;
                 }
         }
-
-        priv->alloc_rxb_page--;
-        free_pages(cmd.reply_page, priv->hw_params.rx_page_order);
+        iwl_free_pages(priv, cmd.reply_page);
 
         return ret;
 }
@@ -391,9 +389,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, const u8 *addr,
                         break;
                 }
         }
-
-        priv->alloc_rxb_page--;
-        free_pages(cmd.reply_page, priv->hw_params.rx_page_order);
+        iwl_free_pages(priv, cmd.reply_page);
 
         return ret;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 00da5e152d46..87ce2bd292c7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -407,13 +407,14 @@ void iwl_hw_txq_ctx_free(struct iwl_priv *priv)
         int txq_id;
 
         /* Tx queues */
-        if (priv->txq)
+        if (priv->txq) {
                 for (txq_id = 0; txq_id < priv->hw_params.max_txq_num;
                      txq_id++)
                         if (txq_id == IWL_CMD_QUEUE_NUM)
                                 iwl_cmd_queue_free(priv);
                         else
                                 iwl_tx_queue_free(priv, txq_id);
+        }
         iwl_free_dma_ptr(priv, &priv->kw);
 
         iwl_free_dma_ptr(priv, &priv->scd_bc_tbls);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 2a28a1f8b1fe..f8e4e4b18d02 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -548,6 +548,9 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         txq = &priv->txq[txq_id];
         q = &txq->q;
 
+        if ((iwl_queue_space(q) < q->high_mark))
+                goto drop;
+
         spin_lock_irqsave(&priv->lock, flags);
 
         idx = get_cmd_index(q, q->write_ptr, 0);
@@ -812,7 +815,7 @@ static int iwl3945_get_measurement(struct iwl_priv *priv,
                 break;
         }
 
-        free_pages(cmd.reply_page, priv->hw_params.rx_page_order);
+        iwl_free_pages(priv, cmd.reply_page);
 
         return rc;
 }
@@ -1198,9 +1201,7 @@ void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
                         pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
                                 PAGE_SIZE << priv->hw_params.rx_page_order,
                                 PCI_DMA_FROMDEVICE);
-                        priv->alloc_rxb_page--;
-                        __free_pages(rxq->pool[i].page,
-                                     priv->hw_params.rx_page_order);
+                        __iwl_free_pages(priv, rxq->pool[i].page);
                         rxq->pool[i].page = NULL;
                 }
                 list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
@@ -1247,10 +1248,8 @@ static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rx
                         pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
                                 PAGE_SIZE << priv->hw_params.rx_page_order,
                                 PCI_DMA_FROMDEVICE);
-                        __free_pages(rxq->pool[i].page,
-                                     priv->hw_params.rx_page_order);
+                        __iwl_free_pages(priv, rxq->pool[i].page);
                         rxq->pool[i].page = NULL;
-                        priv->alloc_rxb_page--;
                 }
         }
 
@@ -1300,47 +1299,6 @@ int iwl3945_calc_db_from_ratio(int sig_ratio)
         return (int)ratio2dB[sig_ratio];
 }
 
-#define PERFECT_RSSI (-20) /* dBm */
-#define WORST_RSSI (-95)   /* dBm */
-#define RSSI_RANGE (PERFECT_RSSI - WORST_RSSI)
-
-/* Calculate an indication of rx signal quality (a percentage, not dBm!).
- * See http://www.ces.clemson.edu/linux/signal_quality.shtml for info
- *   about formulas used below. */
-int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm)
-{
-        int sig_qual;
-        int degradation = PERFECT_RSSI - rssi_dbm;
-
-        /* If we get a noise measurement, use signal-to-noise ratio (SNR)
-         * as indicator; formula is (signal dbm - noise dbm).
-         * SNR at or above 40 is a great signal (100%).
-         * Below that, scale to fit SNR of 0 - 40 dB within 0 - 100% indicator.
-         * Weakest usable signal is usually 10 - 15 dB SNR. */
-        if (noise_dbm) {
-                if (rssi_dbm - noise_dbm >= 40)
-                        return 100;
-                else if (rssi_dbm < noise_dbm)
-                        return 0;
-                sig_qual = ((rssi_dbm - noise_dbm) * 5) / 2;
-
-        /* Else use just the signal level.
-         * This formula is a least squares fit of data points collected and
-         *   compared with a reference system that had a percentage (%) display
-         *   for signal quality. */
-        } else
-                sig_qual = (100 * (RSSI_RANGE * RSSI_RANGE) - degradation *
-                            (15 * RSSI_RANGE + 62 * degradation)) /
-                           (RSSI_RANGE * RSSI_RANGE);
-
-        if (sig_qual > 100)
-                sig_qual = 100;
-        else if (sig_qual < 1)
-                sig_qual = 0;
-
-        return sig_qual;
-}
-
 /**
  * iwl3945_rx_handle - Main entry function for receiving responses from uCode
  *
@@ -1688,7 +1646,7 @@ void iwl3945_dump_nic_event_log(struct iwl_priv *priv, bool full_log)
         }
 
 #ifdef CONFIG_IWLWIFI_DEBUG
-        if (!(iwl_get_debug_level(priv) & IWL_DL_FW_ERRORS))
+        if (!(iwl_get_debug_level(priv) & IWL_DL_FW_ERRORS) && !full_log)
                 size = (size > DEFAULT_IWL3945_DUMP_EVENT_LOG_ENTRIES)
                         ? DEFAULT_IWL3945_DUMP_EVENT_LOG_ENTRIES : size;
 #else
@@ -3867,7 +3825,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
         priv->retry_rate = 1;
         priv->ibss_beacon = NULL;
 
-        spin_lock_init(&priv->lock);
         spin_lock_init(&priv->sta_lock);
         spin_lock_init(&priv->hcmd_lock);
 
@@ -3936,9 +3893,11 @@ static int iwl3945_setup_mac(struct iwl_priv *priv)
         /* Tell mac80211 our characteristics */
         hw->flags = IEEE80211_HW_SIGNAL_DBM |
                     IEEE80211_HW_NOISE_DBM |
-                    IEEE80211_HW_SPECTRUM_MGMT |
-                    IEEE80211_HW_SUPPORTS_PS |
-                    IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
+                    IEEE80211_HW_SPECTRUM_MGMT;
+
+        if (!priv->cfg->broken_powersave)
+                hw->flags |= IEEE80211_HW_SUPPORTS_PS |
+                             IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
 
         hw->wiphy->interface_modes =
                 BIT(NL80211_IFTYPE_STATION) |
@@ -4057,10 +4016,11 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
          * PCI Tx retries from interfering with C3 CPU state */
         pci_write_config_byte(pdev, 0x41, 0x00);
 
-        /* this spin lock will be used in apm_ops.init and EEPROM access
+        /* these spin locks will be used in apm_ops.init and EEPROM access
          * we should init now
          */
         spin_lock_init(&priv->reg_lock);
+        spin_lock_init(&priv->lock);
 
         /***********************
          * 4. Read EEPROM
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h
index 5a26bb05a33a..842811142bef 100644
--- a/drivers/net/wireless/iwmc3200wifi/iwm.h
+++ b/drivers/net/wireless/iwmc3200wifi/iwm.h
@@ -268,7 +268,7 @@ struct iwm_priv {
 
         struct sk_buff_head rx_list;
         struct list_head rx_tickets;
-        struct list_head rx_packets[IWM_RX_ID_HASH];
+        struct list_head rx_packets[IWM_RX_ID_HASH + 1];
         struct workqueue_struct *rx_wq;
         struct work_struct rx_worker;
 
@@ -349,7 +349,7 @@ int iwm_up(struct iwm_priv *iwm);
 int iwm_down(struct iwm_priv *iwm);
 
 /* TX API */
-u16 iwm_tid_to_queue(u16 tid);
+int iwm_tid_to_queue(u16 tid);
 void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages);
 void iwm_tx_worker(struct work_struct *work);
 int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c
index e4f0f8705f65..c4c0d23c63ec 100644
--- a/drivers/net/wireless/iwmc3200wifi/netdev.c
+++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
@@ -76,7 +76,7 @@ static int iwm_stop(struct net_device *ndev)
  */
 static const u16 iwm_1d_to_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 };
 
-u16 iwm_tid_to_queue(u16 tid)
+int iwm_tid_to_queue(u16 tid)
 {
         if (tid > IWM_UMAC_TID_NR - 2)
                 return -EINVAL;
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 1c57c1f72cba..6d6ed7485175 100644
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -1126,7 +1126,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf,
 
                 if (!stop) {
                         struct iwm_tx_queue *txq;
-                        u16 queue = iwm_tid_to_queue(bit);
+                        int queue = iwm_tid_to_queue(bit);
 
                         if (queue < 0)
                                 continue;
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index b9b371bfa30f..42611bea76a3 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1365,7 +1365,7 @@ static void lbs_send_confirmsleep(struct lbs_private *priv)
         priv->dnld_sent = DNLD_RES_RECEIVED;
 
         /* If nothing to do, go back to sleep (?) */
-        if (!__kfifo_len(priv->event_fifo) && !priv->resp_len[priv->resp_idx])
+        if (!kfifo_len(&priv->event_fifo) && !priv->resp_len[priv->resp_idx])
                 priv->psstate = PS_STATE_SLEEP;
 
         spin_unlock_irqrestore(&priv->driver_lock, flags);
@@ -1439,7 +1439,7 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv)
         }
 
         /* Pending events or command responses? */
-        if (__kfifo_len(priv->event_fifo) || priv->resp_len[priv->resp_idx]) {
+        if (kfifo_len(&priv->event_fifo) || priv->resp_len[priv->resp_idx]) {
                 allowed = 0;
                 lbs_deb_host("pending events or command responses\n");
         }
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 6a8d2b291d8c..05bb298dfae9 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -10,7 +10,7 @@
 #include "scan.h"
 #include "assoc.h"
 
-
+#include <linux/kfifo.h>
 
 /** sleep_params */
 struct sleep_params {
@@ -120,7 +120,7 @@ struct lbs_private {
         u32 resp_len[2];
 
         /* Events sent from hardware to driver */
-        struct kfifo *event_fifo;
+        struct kfifo event_fifo;
 
         /** thread to service interrupts */
         struct task_struct *main_thread;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index db38a5a719fa..c2975c8e2f21 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -459,7 +459,7 @@ static int lbs_thread(void *data)
                 else if (!list_empty(&priv->cmdpendingq) &&
                                         !(priv->wakeup_dev_required))
                         shouldsleep = 0;        /* We have a command to send */
-                else if (__kfifo_len(priv->event_fifo))
+                else if (kfifo_len(&priv->event_fifo))
                         shouldsleep = 0;        /* We have an event to process */
                 else
                         shouldsleep = 1;        /* No command */
@@ -511,10 +511,13 @@ static int lbs_thread(void *data)
 
                 /* Process hardware events, e.g. card removed, link lost */
                 spin_lock_irq(&priv->driver_lock);
-                while (__kfifo_len(priv->event_fifo)) {
+                while (kfifo_len(&priv->event_fifo)) {
                         u32 event;
-                        __kfifo_get(priv->event_fifo, (unsigned char *) &event,
-                                sizeof(event));
+
+                        if (kfifo_out(&priv->event_fifo,
+                                (unsigned char *) &event, sizeof(event)) !=
+                                sizeof(event))
+                                        break;
                         spin_unlock_irq(&priv->driver_lock);
                         lbs_process_event(priv, event);
                         spin_lock_irq(&priv->driver_lock);
@@ -883,10 +886,9 @@ static int lbs_init_adapter(struct lbs_private *priv)
         priv->resp_len[0] = priv->resp_len[1] = 0;
 
         /* Create the event FIFO */
-        priv->event_fifo = kfifo_alloc(sizeof(u32) * 16, GFP_KERNEL, NULL);
-        if (IS_ERR(priv->event_fifo)) {
+        ret = kfifo_alloc(&priv->event_fifo, sizeof(u32) * 16, GFP_KERNEL);
+        if (ret) {
                 lbs_pr_err("Out of memory allocating event FIFO buffer\n");
-                ret = -ENOMEM;
                 goto out;
         }
 
@@ -901,8 +903,7 @@ static void lbs_free_adapter(struct lbs_private *priv)
         lbs_deb_enter(LBS_DEB_MAIN);
 
         lbs_free_cmd_buffer(priv);
-        if (priv->event_fifo)
-                kfifo_free(priv->event_fifo);
+        kfifo_free(&priv->event_fifo);
         del_timer(&priv->command_timer);
         del_timer(&priv->auto_deepsleep_timer);
         kfree(priv->networks);
@@ -1177,7 +1178,7 @@ void lbs_queue_event(struct lbs_private *priv, u32 event)
         if (priv->psstate == PS_STATE_SLEEP)
                 priv->psstate = PS_STATE_AWAKE;
 
-        __kfifo_put(priv->event_fifo, (unsigned char *) &event, sizeof(u32));
+        kfifo_in(&priv->event_fifo, (unsigned char *) &event, sizeof(u32));
 
         wake_up_interruptible(&priv->waitq);
 
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c
index 2f91c9b808af..92b7a357a5e4 100644
--- a/drivers/net/wireless/libertas/mesh.c
+++ b/drivers/net/wireless/libertas/mesh.c
@@ -2,6 +2,7 @@
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/netdevice.h>
+#include <linux/if_ether.h>
 #include <linux/if_arp.h>
 #include <linux/kthread.h>
 #include <linux/kfifo.h>
@@ -351,8 +352,7 @@ int lbs_add_mesh(struct lbs_private *priv)
 
         mesh_dev->netdev_ops = &mesh_netdev_ops;
         mesh_dev->ethtool_ops = &lbs_ethtool_ops;
-        memcpy(mesh_dev->dev_addr, priv->dev->dev_addr,
-                        sizeof(priv->dev->dev_addr));
+        memcpy(mesh_dev->dev_addr, priv->dev->dev_addr, ETH_ALEN);
 
         SET_NETDEV_DEV(priv->mesh_dev, priv->dev->dev.parent);
 
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index c6a6c042b82f..b0b1c7841500 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -567,11 +567,8 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
         chan_count = lbs_scan_create_channel_list(priv, chan_list);
 
         netif_stop_queue(priv->dev);
-        netif_carrier_off(priv->dev);
-        if (priv->mesh_dev) {
+        if (priv->mesh_dev)
                 netif_stop_queue(priv->mesh_dev);
-                netif_carrier_off(priv->mesh_dev);
-        }
 
         /* Prepare to continue an interrupted scan */
         lbs_deb_scan("chan_count %d, scan_channel %d\n",
@@ -635,16 +632,13 @@ out2:
         priv->scan_channel = 0;
 
 out:
-        if (priv->connect_status == LBS_CONNECTED) {
-                netif_carrier_on(priv->dev);
-                if (!priv->tx_pending_len)
-                        netif_wake_queue(priv->dev);
-        }
-        if (priv->mesh_dev && (priv->mesh_connect_status == LBS_CONNECTED)) {
-                netif_carrier_on(priv->mesh_dev);
-                if (!priv->tx_pending_len)
-                        netif_wake_queue(priv->mesh_dev);
-        }
+        if (priv->connect_status == LBS_CONNECTED && !priv->tx_pending_len)
+                netif_wake_queue(priv->dev);
+
+        if (priv->mesh_dev && (priv->mesh_connect_status == LBS_CONNECTED) &&
+            !priv->tx_pending_len)
+                netif_wake_queue(priv->mesh_dev);
+
         kfree(chan_list);
 
         lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index a8eb9e1fcf36..4b1aab593a84 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -2025,10 +2025,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
         if (priv->connect_status == LBS_CONNECTED) {
                 memcpy(extra, priv->curbssparams.ssid,
                        priv->curbssparams.ssid_len);
-                extra[priv->curbssparams.ssid_len] = '\0';
         } else {
                 memset(extra, 0, 32);
-                extra[priv->curbssparams.ssid_len] = '\0';
         }
         /*
          * If none, we may want to get the one that was set
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 019431d2f8a9..26a1abd5bb03 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -495,7 +495,6 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
         stats.band = IEEE80211_BAND_2GHZ;
         stats.signal = prxpd->snr;
         stats.noise = prxpd->nf;
-        stats.qual = prxpd->snr - prxpd->nf;
         /* Marvell rate index has a hole at value 4 */
         if (prxpd->rx_rate > 4)
                 --prxpd->rx_rate;
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 59d49159cf2a..59f92105b0c2 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3157,8 +3157,10 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,
         /* Clear unsupported feature flags */
         *total_flags &= FIF_ALLMULTI | FIF_BCN_PRBRESP_PROMISC;
 
-        if (mwl8k_fw_lock(hw))
+        if (mwl8k_fw_lock(hw)) {
+                kfree(cmd);
                 return;
+        }
 
         if (priv->sniffer_enabled) {
                 mwl8k_enable_sniffer(hw, 0);
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 7698fdd6a3a2..31ca241f7753 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -23,7 +23,7 @@
 #define MAX_RID_LEN 1024
 
 /* Helper routine to record keys
- * Do not call from interrupt context */
+ * It is called under orinoco_lock so it may not sleep */
 static int orinoco_set_key(struct orinoco_private *priv, int index,
                            enum orinoco_alg alg, const u8 *key, int key_len,
                            const u8 *seq, int seq_len)
@@ -32,14 +32,14 @@ static int orinoco_set_key(struct orinoco_private *priv, int index,
         kzfree(priv->keys[index].seq);
 
         if (key_len) {
-                priv->keys[index].key = kzalloc(key_len, GFP_KERNEL);
+                priv->keys[index].key = kzalloc(key_len, GFP_ATOMIC);
                 if (!priv->keys[index].key)
                         goto nomem;
         } else
                 priv->keys[index].key = NULL;
 
         if (seq_len) {
-                priv->keys[index].seq = kzalloc(seq_len, GFP_KERNEL);
+                priv->keys[index].seq = kzalloc(seq_len, GFP_ATOMIC);
                 if (!priv->keys[index].seq)
                         goto free_key;
         } else
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index c5fe867665e6..1a7eae357fef 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -1323,7 +1323,7 @@
 #define PAIRWISE_KEY_ENTRY(__idx) \
         ( PAIRWISE_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)) )
 #define MAC_IVEIV_ENTRY(__idx) \
-        ( MAC_IVEIV_TABLE_BASE + ((__idx) & sizeof(struct mac_iveiv_entry)) )
+        ( MAC_IVEIV_TABLE_BASE + ((__idx) * sizeof(struct mac_iveiv_entry)) )
 #define MAC_WCID_ATTR_ENTRY(__idx) \
         ( MAC_WCID_ATTRIBUTE_BASE + ((__idx) * sizeof(u32)) )
 #define SHARED_KEY_ENTRY(__idx) \
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index eb1e1d00bec3..9deae41cb784 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -37,7 +37,7 @@
 #include <linux/module.h>
 
 #include "rt2x00.h"
-#ifdef CONFIG_RT2800USB
+#if defined(CONFIG_RT2800USB) || defined(CONFIG_RT2800USB_MODULE)
 #include "rt2x00usb.h"
 #endif
 #include "rt2800lib.h"
@@ -340,7 +340,7 @@ static int rt2800_blink_set(struct led_classdev *led_cdev,
         rt2x00_set_field32(&reg, LED_CFG_OFF_PERIOD, *delay_off);
         rt2x00_set_field32(&reg, LED_CFG_SLOW_BLINK_PERIOD, 3);
         rt2x00_set_field32(&reg, LED_CFG_R_LED_MODE, 3);
-        rt2x00_set_field32(&reg, LED_CFG_G_LED_MODE, 12);
+        rt2x00_set_field32(&reg, LED_CFG_G_LED_MODE, 3);
         rt2x00_set_field32(&reg, LED_CFG_Y_LED_MODE, 3);
         rt2x00_set_field32(&reg, LED_CFG_LED_POLAR, 1);
         rt2800_register_write(led->rt2x00dev, LED_CFG, reg);
@@ -1121,7 +1121,7 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
 
         if (rt2x00_intf_is_usb(rt2x00dev)) {
                 rt2800_register_write(rt2x00dev, USB_DMA_CFG, 0x00000000);
-#ifdef CONFIG_RT2800USB
+#if defined(CONFIG_RT2800USB) || defined(CONFIG_RT2800USB_MODULE)
                 rt2x00usb_vendor_request_sw(rt2x00dev, USB_DEVICE_MODE, 0,
                                             USB_MODE_RESET, REGISTER_TIMEOUT);
 #endif
@@ -2022,6 +2022,12 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         u16 eeprom;
 
         /*
+         * Disable powersaving as default on PCI devices.
+         */
+        if (rt2x00_intf_is_pci(rt2x00dev))
+                rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+        /*
          * Initialize all hw fields.
          */
         rt2x00dev->hw->flags =
@@ -2074,8 +2080,7 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
             IEEE80211_HT_CAP_SGI_20 |
             IEEE80211_HT_CAP_SGI_40 |
             IEEE80211_HT_CAP_TX_STBC |
-            IEEE80211_HT_CAP_RX_STBC |
-            IEEE80211_HT_CAP_PSMP_SUPPORT;
+            IEEE80211_HT_CAP_RX_STBC;
         spec->ht.ampdu_factor = 3;
         spec->ht.ampdu_density = 4;
         spec->ht.mcs.tx_params =
@@ -2140,8 +2145,8 @@ static void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx,
         rt2800_register_multiread(rt2x00dev, offset,
                                       &iveiv_entry, sizeof(iveiv_entry));
 
-        memcpy(&iveiv_entry.iv[0], iv16, sizeof(iv16));
-        memcpy(&iveiv_entry.iv[4], iv32, sizeof(iv32));
+        memcpy(iv16, &iveiv_entry.iv[0], sizeof(*iv16));
+        memcpy(iv32, &iveiv_entry.iv[4], sizeof(*iv32));
 }
 
 static int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index af85d18cdbe7..ab95346cf6a3 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -922,6 +922,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x1737, 0x0070), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x1737, 0x0071), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x1737, 0x0077), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Logitec */
         { USB_DEVICE(0x0789, 0x0162), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0789, 0x0163), USB_DEVICE_DATA(&rt2800usb_ops) },
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 4d841c07c970..dcfc8c25d1a7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -113,6 +113,12 @@
         (  ((unsigned long)((__skb)->data + (__header))) & 3 )
 
 /*
+ * Constants for extra TX headroom for alignment purposes.
+ */
+#define RT2X00_ALIGN_SIZE       4 /* Only whole frame needs alignment */
+#define RT2X00_L2PAD_SIZE       8 /* Both header & payload need alignment */
+
+/*
  * Standard timing and size defines.
  * These values should follow the ieee80211 specifications.
  */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 06c43ca39bf8..265e66dba552 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -686,7 +686,17 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize extra TX headroom required.
          */
-        rt2x00dev->hw->extra_tx_headroom = rt2x00dev->ops->extra_tx_headroom;
+        rt2x00dev->hw->extra_tx_headroom =
+                max_t(unsigned int, IEEE80211_TX_STATUS_HEADROOM,
+                      rt2x00dev->ops->extra_tx_headroom);
+
+        /*
+         * Take TX headroom required for alignment into account.
+         */
+        if (test_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags))
+                rt2x00dev->hw->extra_tx_headroom += RT2X00_L2PAD_SIZE;
+        else if (test_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags))
+                rt2x00dev->hw->extra_tx_headroom += RT2X00_ALIGN_SIZE;
 
         /*
          * Register HW.
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 239afc7a9c0b..9915a09141ef 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -104,7 +104,7 @@ void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
          * is also mapped to the DMA so it can be used for transfering
          * additional descriptor information to the hardware.
          */
-        skb_push(skb, rt2x00dev->hw->extra_tx_headroom);
+        skb_push(skb, rt2x00dev->ops->extra_tx_headroom);
 
         skbdesc->skb_dma =
             dma_map_single(rt2x00dev->dev, skb->data, skb->len, DMA_TO_DEVICE);
@@ -112,7 +112,7 @@ void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
         /*
          * Restore data pointer to original location again.
          */
-        skb_pull(skb, rt2x00dev->hw->extra_tx_headroom);
+        skb_pull(skb, rt2x00dev->ops->extra_tx_headroom);
 
         skbdesc->flags |= SKBDESC_DMA_MAPPED_TX;
 }
@@ -134,7 +134,7 @@ void rt2x00queue_unmap_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb)
                  * by the driver, but it was actually mapped to DMA.
                  */
                 dma_unmap_single(rt2x00dev->dev, skbdesc->skb_dma,
-                                 skb->len + rt2x00dev->hw->extra_tx_headroom,
+                                 skb->len + rt2x00dev->ops->extra_tx_headroom,
                                  DMA_TO_DEVICE);
                 skbdesc->flags &= ~SKBDESC_DMA_MAPPED_TX;
         }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 687e17dc2e9f..0ca589306d71 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2539,6 +2539,11 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         unsigned int i;
 
         /*
+         * Disable powersaving as default.
+         */
+        rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+        /*
          * Initialize all hw fields.
          */
         rt2x00dev->hw->flags =
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index a1a3dd15c664..8a40a1439984 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -132,7 +132,6 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
 
                         rx_status.antenna = (flags2 >> 15) & 1;
                         /* TODO: improve signal/rssi reporting */
-                        rx_status.qual = flags2 & 0xFF;
                         rx_status.signal = (flags2 >> 8) & 0x7F;
                         /* XXX: is this correct? */
                         rx_status.rate_idx = (flags >> 20) & 0xF;
diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.c b/drivers/net/wireless/wl12xx/wl1251_boot.c
index 2e733e7bdfd4..28a808674080 100644
--- a/drivers/net/wireless/wl12xx/wl1251_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1251_boot.c
@@ -256,7 +256,7 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
                 }
         }
 
-        if (loop >= INIT_LOOP) {
+        if (loop > INIT_LOOP) {
                 wl1251_error("timeout waiting for the hardware to "
                              "complete initialization");
                 return -EIO;
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index 886a9bc39cc1..c3385b3d246c 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -777,7 +777,7 @@ out:
         return ret;
 }
 
-static int wl1271_build_basic_rates(char *rates, u8 band)
+static int wl1271_build_basic_rates(u8 *rates, u8 band)
 {
         u8 index = 0;
 
@@ -804,7 +804,7 @@ static int wl1271_build_basic_rates(char *rates, u8 band)
         return index;
 }
 
-static int wl1271_build_extended_rates(char *rates, u8 band)
+static int wl1271_build_extended_rates(u8 *rates, u8 band)
 {
         u8 index = 0;
 
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index dfa1b9bc22c8..7ca95c414fa8 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1325,151 +1325,11 @@ int zd_chip_set_basic_rates(struct zd_chip *chip, u16 cr_rates)
         return r;
 }
 
-static int ofdm_qual_db(u8 status_quality, u8 zd_rate, unsigned int size)
-{
-        static const u16 constants[] = {
-                715, 655, 585, 540, 470, 410, 360, 315,
-                270, 235, 205, 175, 150, 125, 105,  85,
-                 65,  50,  40,  25,  15
-        };
-
-        int i;
-        u32 x;
-
-        /* It seems that their quality parameter is somehow per signal
-         * and is now transferred per bit.
-         */
-        switch (zd_rate) {
-        case ZD_OFDM_RATE_6M:
-        case ZD_OFDM_RATE_12M:
-        case ZD_OFDM_RATE_24M:
-                size *= 2;
-                break;
-        case ZD_OFDM_RATE_9M:
-        case ZD_OFDM_RATE_18M:
-        case ZD_OFDM_RATE_36M:
-        case ZD_OFDM_RATE_54M:
-                size *= 4;
-                size /= 3;
-                break;
-        case ZD_OFDM_RATE_48M:
-                size *= 3;
-                size /= 2;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        x = (10000 * status_quality)/size;
-        for (i = 0; i < ARRAY_SIZE(constants); i++) {
-                if (x > constants[i])
-                        break;
-        }
-
-        switch (zd_rate) {
-        case ZD_OFDM_RATE_6M:
-        case ZD_OFDM_RATE_9M:
-                i += 3;
-                break;
-        case ZD_OFDM_RATE_12M:
-        case ZD_OFDM_RATE_18M:
-                i += 5;
-                break;
-        case ZD_OFDM_RATE_24M:
-        case ZD_OFDM_RATE_36M:
-                i += 9;
-                break;
-        case ZD_OFDM_RATE_48M:
-        case ZD_OFDM_RATE_54M:
-                i += 15;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return i;
-}
-
-static int ofdm_qual_percent(u8 status_quality, u8 zd_rate, unsigned int size)
-{
-        int r;
-
-        r = ofdm_qual_db(status_quality, zd_rate, size);
-        ZD_ASSERT(r >= 0);
-        if (r < 0)
-                r = 0;
-
-        r = (r * 100)/29;
-        return r <= 100 ? r : 100;
-}
-
-static unsigned int log10times100(unsigned int x)
-{
-        static const u8 log10[] = {
-                  0,
-                  0,   30,   47,   60,   69,   77,   84,   90,   95,  100,
-                104,  107,  111,  114,  117,  120,  123,  125,  127,  130,
-                132,  134,  136,  138,  139,  141,  143,  144,  146,  147,
-                149,  150,  151,  153,  154,  155,  156,  157,  159,  160,
-                161,  162,  163,  164,  165,  166,  167,  168,  169,  169,
-                170,  171,  172,  173,  174,  174,  175,  176,  177,  177,
-                178,  179,  179,  180,  181,  181,  182,  183,  183,  184,
-                185,  185,  186,  186,  187,  188,  188,  189,  189,  190,
-                190,  191,  191,  192,  192,  193,  193,  194,  194,  195,
-                195,  196,  196,  197,  197,  198,  198,  199,  199,  200,
-                200,  200,  201,  201,  202,  202,  202,  203,  203,  204,
-                204,  204,  205,  205,  206,  206,  206,  207,  207,  207,
-                208,  208,  208,  209,  209,  210,  210,  210,  211,  211,
-                211,  212,  212,  212,  213,  213,  213,  213,  214,  214,
-                214,  215,  215,  215,  216,  216,  216,  217,  217,  217,
-                217,  218,  218,  218,  219,  219,  219,  219,  220,  220,
-                220,  220,  221,  221,  221,  222,  222,  222,  222,  223,
-                223,  223,  223,  224,  224,  224,  224,
-        };
-
-        return x < ARRAY_SIZE(log10) ? log10[x] : 225;
-}
-
-enum {
-        MAX_CCK_EVM_DB = 45,
-};
-
-static int cck_evm_db(u8 status_quality)
-{
-        return (20 * log10times100(status_quality)) / 100;
-}
-
-static int cck_snr_db(u8 status_quality)
-{
-        int r = MAX_CCK_EVM_DB - cck_evm_db(status_quality);
-        ZD_ASSERT(r >= 0);
-        return r;
-}
-
-static int cck_qual_percent(u8 status_quality)
-{
-        int r;
-
-        r = cck_snr_db(status_quality);
-        r = (100*r)/17;
-        return r <= 100 ? r : 100;
-}
-
 static inline u8 zd_rate_from_ofdm_plcp_header(const void *rx_frame)
 {
         return ZD_OFDM | zd_ofdm_plcp_header_rate(rx_frame);
 }
 
-u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size,
-                      const struct rx_status *status)
-{
-        return (status->frame_status&ZD_RX_OFDM) ?
-                ofdm_qual_percent(status->signal_quality_ofdm,
-                                  zd_rate_from_ofdm_plcp_header(rx_frame),
-                                  size) :
-                cck_qual_percent(status->signal_quality_cck);
-}
-
 /**
  * zd_rx_rate - report zd-rate
  * @rx_frame - received frame
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 9fd8f3508d66..f8bbf7d302ae 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -929,9 +929,6 @@ static inline int zd_get_beacon_interval(struct zd_chip *chip, u32 *interval)
 
 struct rx_status;
 
-u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size,
-                       const struct rx_status *status);
-
 u8 zd_rx_rate(const void *rx_frame, const struct rx_status *status);
 
 struct zd_mc_hash {
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index cf51e8f8174b..f14deb0c8514 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -828,9 +828,6 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
         stats.freq = zd_channels[_zd_chip_get_channel(&mac->chip) - 1].center_freq;
         stats.band = IEEE80211_BAND_2GHZ;
         stats.signal = status->signal_strength;
-        stats.qual = zd_rx_qual_percent(buffer,
-                                          length - sizeof(struct rx_status),
-                                          status);
 
         rate = zd_rx_rate(buffer, status);
 
@@ -990,12 +987,13 @@ static void zd_op_configure_filter(struct ieee80211_hw *hw,
         changed_flags &= SUPPORTED_FIF_FLAGS;
         *new_flags &= SUPPORTED_FIF_FLAGS;
 
-        /* changed_flags is always populated but this driver
-         * doesn't support all FIF flags so its possible we don't
-         * need to do anything */
-        if (!changed_flags)
-                return;
-
+        /*
+         * If multicast parameter (as returned by zd_op_prepare_multicast)
+         * has changed, no bit in changed_flags is set. To handle this
+         * situation, we do not return if changed_flags is 0. If we do so,
+         * we will have some issue with IPv6 which uses multicast for link
+         * layer address resolution.
+         */
         if (*new_flags & (FIF_PROMISC_IN_BSS | FIF_ALLMULTI))
                 zd_mc_add_all(&hash);