Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/netconsole.c
	net/bridge/br_private.h

Three mostly trivial conflicts.

The net/bridge/br_private.h conflict was a function signature (argument
addition) change overlapping with the extern removals from Joe Perches.

In drivers/net/netconsole.c we had one change adjusting a printk message
whilst another changed "printk(KERN_INFO" into "pr_info(".

Lastly, the emulex change was a new inline function addition overlapping
with Joe Perches's extern removals.

Signed-off-by: David S. Miller <davem@davemloft.net>

20 files changed, 116 insertions, 159 deletions

diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index a668cd491cb3..e3fc07cf2f62 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -814,9 +814,6 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
                         msg_ctrl_save = priv->read_reg(priv,
                                         C_CAN_IFACE(MSGCTRL_REG, 0));
 
-                        if (msg_ctrl_save & IF_MCONT_EOB)
-                                return num_rx_pkts;
-
                         if (msg_ctrl_save & IF_MCONT_MSGLST) {
                                 c_can_handle_lost_msg_obj(dev, 0, msg_obj);
                                 num_rx_pkts++;
@@ -824,6 +821,9 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
                                 continue;
                         }
 
+                        if (msg_ctrl_save & IF_MCONT_EOB)
+                                return num_rx_pkts;
+
                         if (!(msg_ctrl_save & IF_MCONT_NEWDAT))
                                 continue;
 
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 3b9546588240..4b2d5ed62b11 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -1544,9 +1544,9 @@ static int kvaser_usb_init_one(struct usb_interface *intf,
         return 0;
 }
 
-static void kvaser_usb_get_endpoints(const struct usb_interface *intf,
-                                     struct usb_endpoint_descriptor **in,
-                                     struct usb_endpoint_descriptor **out)
+static int kvaser_usb_get_endpoints(const struct usb_interface *intf,
+                                    struct usb_endpoint_descriptor **in,
+                                    struct usb_endpoint_descriptor **out)
 {
         const struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
@@ -1557,12 +1557,18 @@ static void kvaser_usb_get_endpoints(const struct usb_interface *intf,
         for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
                 endpoint = &iface_desc->endpoint[i].desc;
 
-                if (usb_endpoint_is_bulk_in(endpoint))
+                if (!*in && usb_endpoint_is_bulk_in(endpoint))
                         *in = endpoint;
 
-                if (usb_endpoint_is_bulk_out(endpoint))
+                if (!*out && usb_endpoint_is_bulk_out(endpoint))
                         *out = endpoint;
+
+                /* use first bulk endpoint for in and out */
+                if (*in && *out)
+                        return 0;
         }
+
+        return -ENODEV;
 }
 
 static int kvaser_usb_probe(struct usb_interface *intf,
@@ -1576,8 +1582,8 @@ static int kvaser_usb_probe(struct usb_interface *intf,
         if (!dev)
                 return -ENOMEM;
 
-        kvaser_usb_get_endpoints(intf, &dev->bulk_in, &dev->bulk_out);
-        if (!dev->bulk_in || !dev->bulk_out) {
+        err = kvaser_usb_get_endpoints(intf, &dev->bulk_in, &dev->bulk_out);
+        if (err) {
                 dev_err(&intf->dev, "Cannot get usb endpoint(s)");
                 return err;
         }
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index a98778e3af84..e2aa09ce6af7 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -252,25 +252,33 @@ static int bgmac_dma_rx_skb_for_slot(struct bgmac *bgmac,
                                      struct bgmac_slot_info *slot)
 {
         struct device *dma_dev = bgmac->core->dma_dev;
+        struct sk_buff *skb;
+        dma_addr_t dma_addr;
         struct bgmac_rx_header *rx;
 
         /* Alloc skb */
-        slot->skb = netdev_alloc_skb(bgmac->net_dev, BGMAC_RX_BUF_SIZE);
-        if (!slot->skb)
+        skb = netdev_alloc_skb(bgmac->net_dev, BGMAC_RX_BUF_SIZE);
+        if (!skb)
                 return -ENOMEM;
 
         /* Poison - if everything goes fine, hardware will overwrite it */
-        rx = (struct bgmac_rx_header *)slot->skb->data;
+        rx = (struct bgmac_rx_header *)skb->data;
         rx->len = cpu_to_le16(0xdead);
         rx->flags = cpu_to_le16(0xbeef);
 
         /* Map skb for the DMA */
-        slot->dma_addr = dma_map_single(dma_dev, slot->skb->data,
-                                        BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
-        if (dma_mapping_error(dma_dev, slot->dma_addr)) {
+        dma_addr = dma_map_single(dma_dev, skb->data,
+                                  BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
+        if (dma_mapping_error(dma_dev, dma_addr)) {
                 bgmac_err(bgmac, "DMA mapping error\n");
+                dev_kfree_skb(skb);
                 return -ENOMEM;
         }
+
+        /* Update the slot */
+        slot->skb = skb;
+        slot->dma_addr = dma_addr;
+
         if (slot->dma_addr & 0xC0000000)
                 bgmac_warn(bgmac, "DMA address using 0xC0000000 bit(s), it may need translation trick\n");
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 6e46cff5236d..dcafbda3e5be 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2545,10 +2545,6 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 }
         }
 
-        /* Allocated memory for FW statistics  */
-        if (bnx2x_alloc_fw_stats_mem(bp))
-                LOAD_ERROR_EXIT(bp, load_error0);
-
         /* need to be done after alloc mem, since it's self adjusting to amount
          * of memory available for RSS queues
          */
@@ -2558,6 +2554,10 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 LOAD_ERROR_EXIT(bp, load_error0);
         }
 
+        /* Allocated memory for FW statistics  */
+        if (bnx2x_alloc_fw_stats_mem(bp))
+                LOAD_ERROR_EXIT(bp, load_error0);
+
         /* request pf to initialize status blocks */
         if (IS_VF(bp)) {
                 rc = bnx2x_vfpf_init(bp);
@@ -2812,8 +2812,8 @@ load_error1:
         if (IS_PF(bp))
                 bnx2x_clear_pf_load(bp);
 load_error0:
-        bnx2x_free_fp_mem(bp);
         bnx2x_free_fw_stats_mem(bp);
+        bnx2x_free_fp_mem(bp);
         bnx2x_free_mem(bp);
 
         return rc;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 71fffad94aff..0216d592d0ce 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -2018,6 +2018,8 @@ failed:
 
 void bnx2x_iov_remove_one(struct bnx2x *bp)
 {
+        int vf_idx;
+
         /* if SRIOV is not enabled there's nothing to do */
         if (!IS_SRIOV(bp))
                 return;
@@ -2026,6 +2028,18 @@ void bnx2x_iov_remove_one(struct bnx2x *bp)
         pci_disable_sriov(bp->pdev);
         DP(BNX2X_MSG_IOV, "sriov disabled\n");
 
+        /* disable access to all VFs */
+        for (vf_idx = 0; vf_idx < bp->vfdb->sriov.total; vf_idx++) {
+                bnx2x_pretend_func(bp,
+                                   HW_VF_HANDLE(bp,
+                                                bp->vfdb->sriov.first_vf_in_pf +
+                                                vf_idx));
+                DP(BNX2X_MSG_IOV, "disabling internal access for vf %d\n",
+                   bp->vfdb->sriov.first_vf_in_pf + vf_idx);
+                bnx2x_vf_enable_internal(bp, 0);
+                bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
+        }
+
         /* free vf database */
         __bnx2x_iov_free_vfdb(bp);
 }
@@ -3197,7 +3211,7 @@ int bnx2x_enable_sriov(struct bnx2x *bp)
          * the "acquire" messages to appear on the VF PF channel.
          */
         DP(BNX2X_MSG_IOV, "about to call enable sriov\n");
-        pci_disable_sriov(bp->pdev);
+        bnx2x_disable_sriov(bp);
         rc = pci_enable_sriov(bp->pdev, req_vfs);
         if (rc) {
                 BNX2X_ERR("pci_enable_sriov failed with %d\n", rc);
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
index 9c89dc8fe105..632b318eb38a 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
@@ -1599,7 +1599,8 @@ static void write_ofld_wr(struct adapter *adap, struct sk_buff *skb,
         flits = skb_transport_offset(skb) / 8;
         sgp = ndesc == 1 ? (struct sg_ent *)&d->flit[flits] : sgl;
         sgl_flits = make_sgl(skb, sgp, skb_transport_header(skb),
-                             skb->tail - skb->transport_header,
+                             skb_tail_pointer(skb) -
+                             skb_transport_header(skb),
                              adap->pdev);
         if (need_skb_unmap()) {
                 setup_deferred_unmapping(skb, adap->pdev, sgp, sgl_flits);
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 2c88ac295eea..f4825db5d179 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -840,6 +840,16 @@ int be_load_fw(struct be_adapter *adapter, u8 *func);
 bool be_is_wol_supported(struct be_adapter *adapter);
 bool be_pause_supported(struct be_adapter *adapter);
 u32 be_get_fw_log_level(struct be_adapter *adapter);
+
+static inline int fw_major_num(const char *fw_ver)
+{
+        int fw_major = 0;
+
+        sscanf(fw_ver, "%d.", &fw_major);
+
+        return fw_major;
+}
+
 int be_update_queues(struct be_adapter *adapter);
 int be_poll(struct napi_struct *napi, int budget);
 
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 8080a1a5cee7..741d3bff5ae7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3379,6 +3379,12 @@ static int be_setup(struct be_adapter *adapter)
 
         be_cmd_get_fw_ver(adapter, adapter->fw_ver, adapter->fw_on_flash);
 
+        if (BE2_chip(adapter) && fw_major_num(adapter->fw_ver) < 4) {
+                dev_err(dev, "Firmware on card is old(%s), IRQs may not work.",
+                        adapter->fw_ver);
+                dev_err(dev, "Please upgrade firmware to version >= 4.0\n");
+        }
+
         if (adapter->vlans_added)
                 be_vid_config(adapter);
 
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index dac564c25440..e7847510eda2 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -263,7 +263,9 @@ static inline void mal_schedule_poll(struct mal_instance *mal)
 {
         if (likely(napi_schedule_prep(&mal->napi))) {
                 MAL_DBG2(mal, "schedule_poll" NL);
+                spin_lock(&mal->lock);
                 mal_disable_eob_irq(mal);
+                spin_unlock(&mal->lock);
                 __napi_schedule(&mal->napi);
         } else
                 MAL_DBG2(mal, "already in poll" NL);
@@ -442,15 +444,13 @@ static int mal_poll(struct napi_struct *napi, int budget)
                 if (unlikely(mc->ops->peek_rx(mc->dev) ||
                              test_bit(MAL_COMMAC_RX_STOPPED, &mc->flags))) {
                         MAL_DBG2(mal, "rotting packet" NL);
-                        if (napi_reschedule(napi))
-                                mal_disable_eob_irq(mal);
-                        else
-                                MAL_DBG2(mal, "already in poll list" NL);
-
-                        if (budget > 0)
-                                goto again;
-                        else
+                        if (!napi_reschedule(napi))
                                 goto more_work;
+
+                        spin_lock_irqsave(&mal->lock, flags);
+                        mal_disable_eob_irq(mal);
+                        spin_unlock_irqrestore(&mal->lock, flags);
+                        goto again;
                 }
                 mc->ops->poll_tx(mc->dev);
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 735765c21c95..ae8eb4c4fb6c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1691,7 +1691,7 @@ static void mlx4_master_deactivate_admin_state(struct mlx4_priv *priv, int slave
                         vp_oper->vlan_idx = NO_INDX;
                 }
                 if (NO_INDX != vp_oper->mac_idx) {
-                        __mlx4_unregister_mac(&priv->dev, port, vp_oper->mac_idx);
+                        __mlx4_unregister_mac(&priv->dev, port, vp_oper->state.mac);
                         vp_oper->mac_idx = NO_INDX;
                 }
         }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index a126bdf27952..a44b9395b37a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -2276,9 +2276,9 @@ int qlcnic_83xx_get_nic_info(struct qlcnic_adapter *adapter,
                 temp = (cmd.rsp.arg[8] & 0x7FFE0000) >> 17;
                 npar_info->max_linkspeed_reg_offset = temp;
         }
-        if (npar_info->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS)
-                memcpy(ahw->extra_capability, &cmd.rsp.arg[16],
-                       sizeof(ahw->extra_capability));
+
+        memcpy(ahw->extra_capability, &cmd.rsp.arg[16],
+               sizeof(ahw->extra_capability));
 
 out:
         qlcnic_free_mbx_args(&cmd);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index 73e72eb83bdf..6f7f60c09f07 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -785,8 +785,6 @@ void qlcnic_82xx_config_intr_coalesce(struct qlcnic_adapter *adapter)
 
 #define QLCNIC_ENABLE_IPV4_LRO          1
 #define QLCNIC_ENABLE_IPV6_LRO          2
-#define QLCNIC_NO_DEST_IPV4_CHECK       (1 << 8)
-#define QLCNIC_NO_DEST_IPV6_CHECK       (2 << 8)
 
 int qlcnic_82xx_config_hw_lro(struct qlcnic_adapter *adapter, int enable)
 {
@@ -806,11 +804,10 @@ int qlcnic_82xx_config_hw_lro(struct qlcnic_adapter *adapter, int enable)
 
         word = 0;
         if (enable) {
-                word = QLCNIC_ENABLE_IPV4_LRO | QLCNIC_NO_DEST_IPV4_CHECK;
+                word = QLCNIC_ENABLE_IPV4_LRO;
                 if (adapter->ahw->extra_capability[0] &
                     QLCNIC_FW_CAP2_HW_LRO_IPV6)
-                        word |= QLCNIC_ENABLE_IPV6_LRO |
-                                QLCNIC_NO_DEST_IPV6_CHECK;
+                        word |= QLCNIC_ENABLE_IPV6_LRO;
         }
 
         req.words[0] = cpu_to_le64(word);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index dcf4a4e7ce23..b97e4a0079d1 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1133,7 +1133,10 @@ qlcnic_initialize_nic(struct qlcnic_adapter *adapter)
                 if (err == -EIO)
                         return err;
                 adapter->ahw->extra_capability[0] = temp;
+        } else {
+                adapter->ahw->extra_capability[0] = 0;
         }
+
         adapter->ahw->max_mac_filters = nic_info.max_mac_filters;
         adapter->ahw->max_mtu = nic_info.max_mtu;
 
@@ -2161,8 +2164,7 @@ void qlcnic_set_drv_version(struct qlcnic_adapter *adapter)
         else if (qlcnic_83xx_check(adapter))
                 fw_cmd = QLCNIC_CMD_83XX_SET_DRV_VER;
 
-        if ((ahw->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS) &&
-            (ahw->extra_capability[0] & QLCNIC_FW_CAPABILITY_SET_DRV_VER))
+        if (ahw->extra_capability[0] & QLCNIC_FW_CAPABILITY_SET_DRV_VER)
                 qlcnic_fw_cmd_set_drv_version(adapter, fw_cmd);
 }
 
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index a8ef4c4b94be..ba2f5e710af1 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -312,6 +312,7 @@ static ssize_t store_enabled(struct netconsole_target *nt,
                              const char *buf,
                              size_t count)
 {
+        unsigned long flags;
         int enabled;
         int err;
 
@@ -326,9 +327,7 @@ static ssize_t store_enabled(struct netconsole_target *nt,
                 return -EINVAL;
         }
 
-        mutex_lock(&nt->mutex);
         if (enabled) {  /* 1 */
-
                 /*
                  * Skip netpoll_parse_options() -- all the attributes are
                  * already configured via configfs. Just print them out.
@@ -336,19 +335,22 @@ static ssize_t store_enabled(struct netconsole_target *nt,
                 netpoll_print_options(&nt->np);
 
                 err = netpoll_setup(&nt->np);
-                if (err) {
-                        mutex_unlock(&nt->mutex);
+                if (err)
                         return err;
-                }
-
-                pr_info("network logging started\n");
 
+                pr_info("netconsole: network logging started\n");
         } else {        /* 0 */
+                /* We need to disable the netconsole before cleaning it up
+                 * otherwise we might end up in write_msg() with
+                 * nt->np.dev == NULL and nt->enabled == 1
+                 */
+                spin_lock_irqsave(&target_list_lock, flags);
+                nt->enabled = 0;
+                spin_unlock_irqrestore(&target_list_lock, flags);
                 netpoll_cleanup(&nt->np);
         }
 
         nt->enabled = enabled;
-        mutex_unlock(&nt->mutex);
 
         return strnlen(buf, count);
 }
@@ -559,8 +561,10 @@ static ssize_t netconsole_target_attr_store(struct config_item *item,
         struct netconsole_target_attr *na =
                 container_of(attr, struct netconsole_target_attr, attr);
 
+        mutex_lock(&nt->mutex);
         if (na->store)
                 ret = na->store(nt, buf, count);
+        mutex_unlock(&nt->mutex);
 
         return ret;
 }
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 846cc19c04f2..8e8d0fcd4979 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -78,7 +78,6 @@
 #define AX_MEDIUM_STATUS_MODE                   0x22
         #define AX_MEDIUM_GIGAMODE      0x01
         #define AX_MEDIUM_FULL_DUPLEX   0x02
-        #define AX_MEDIUM_ALWAYS_ONE    0x04
         #define AX_MEDIUM_EN_125MHZ     0x08
         #define AX_MEDIUM_RXFLOW_CTRLEN 0x10
         #define AX_MEDIUM_TXFLOW_CTRLEN 0x20
@@ -1065,8 +1064,8 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
 
         /* Configure default medium type => giga */
         *tmp16 = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
-                 AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_ALWAYS_ONE |
-                 AX_MEDIUM_FULL_DUPLEX | AX_MEDIUM_GIGAMODE;
+                 AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_FULL_DUPLEX |
+                 AX_MEDIUM_GIGAMODE;
         ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
                           2, 2, tmp16);
 
@@ -1225,7 +1224,7 @@ static int ax88179_link_reset(struct usbnet *dev)
         }
 
         mode = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
-               AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_ALWAYS_ONE;
+               AX_MEDIUM_RXFLOW_CTRLEN;
 
         ax88179_read_cmd(dev, AX_ACCESS_MAC, PHYSICAL_LINK_STATUS,
                          1, 1, &link_sts);
@@ -1339,8 +1338,8 @@ static int ax88179_reset(struct usbnet *dev)
 
         /* Configure default medium type => giga */
         *tmp16 = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
-                 AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_ALWAYS_ONE |
-                 AX_MEDIUM_FULL_DUPLEX | AX_MEDIUM_GIGAMODE;
+                 AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_FULL_DUPLEX |
+                 AX_MEDIUM_GIGAMODE;
         ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
                           2, 2, tmp16);
 
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 113ee93dbb2e..656a02e28e26 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1160,11 +1160,6 @@ static int virtnet_cpu_callback(struct notifier_block *nfb,
 {
         struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb);
 
-        mutex_lock(&vi->config_lock);
-
-        if (!vi->config_enable)
-                goto done;
-
         switch(action & ~CPU_TASKS_FROZEN) {
         case CPU_ONLINE:
         case CPU_DOWN_FAILED:
@@ -1178,8 +1173,6 @@ static int virtnet_cpu_callback(struct notifier_block *nfb,
                 break;
         }
 
-done:
-        mutex_unlock(&vi->config_lock);
         return NOTIFY_OK;
 }
 
@@ -1747,6 +1740,8 @@ static int virtnet_freeze(struct virtio_device *vdev)
         struct virtnet_info *vi = vdev->priv;
         int i;
 
+        unregister_hotcpu_notifier(&vi->nb);
+
         /* Prevent config work handler from accessing the device */
         mutex_lock(&vi->config_lock);
         vi->config_enable = false;
@@ -1795,6 +1790,10 @@ static int virtnet_restore(struct virtio_device *vdev)
         virtnet_set_queues(vi, vi->curr_queue_pairs);
         rtnl_unlock();
 
+        err = register_hotcpu_notifier(&vi->nb);
+        if (err)
+                return err;
+
         return 0;
 }
 #endif
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 5bbcb5e3ee0c..388ddf60a66d 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -148,10 +148,6 @@ static int  enslave( struct net_device *, struct net_device * );
 static int  emancipate( struct net_device * );
 #endif
 
-#ifdef __i386__
-#define ASM_CRC 1
-#endif
-
 static const char  version[] =
         "Granch SBNI12 driver ver 5.0.1  Jun 22 2001  Denis I.Timofeev.\n";
 
@@ -1551,88 +1547,6 @@ __setup( "sbni=", sbni_setup );
 
 /* -------------------------------------------------------------------------- */
 
-#ifdef ASM_CRC
-
-static u32
-calc_crc32( u32  crc,  u8  *p,  u32  len )
-{
-        register u32  _crc;
-        _crc = crc;
-        
-        __asm__ __volatile__ (
-                "xorl   %%ebx, %%ebx\n"
-                "movl   %2, %%esi\n" 
-                "movl   %3, %%ecx\n" 
-                "movl   $crc32tab, %%edi\n"
-                "shrl   $2, %%ecx\n"
-                "jz     1f\n"
-
-                ".align 4\n"
-        "0:\n"
-                "movb   %%al, %%bl\n"
-                "movl   (%%esi), %%edx\n"
-                "shrl   $8, %%eax\n"
-                "xorb   %%dl, %%bl\n"
-                "shrl   $8, %%edx\n"
-                "xorl   (%%edi,%%ebx,4), %%eax\n"
-
-                "movb   %%al, %%bl\n"
-                "shrl   $8, %%eax\n"
-                "xorb   %%dl, %%bl\n"
-                "shrl   $8, %%edx\n"
-                "xorl   (%%edi,%%ebx,4), %%eax\n"
-
-                "movb   %%al, %%bl\n"
-                "shrl   $8, %%eax\n"
-                "xorb   %%dl, %%bl\n"
-                "movb   %%dh, %%dl\n" 
-                "xorl   (%%edi,%%ebx,4), %%eax\n"
-
-                "movb   %%al, %%bl\n"
-                "shrl   $8, %%eax\n"
-                "xorb   %%dl, %%bl\n"
-                "addl   $4, %%esi\n"
-                "xorl   (%%edi,%%ebx,4), %%eax\n"
-
-                "decl   %%ecx\n"
-                "jnz    0b\n"
-
-        "1:\n"
-                "movl   %3, %%ecx\n"
-                "andl   $3, %%ecx\n"
-                "jz     2f\n"
-
-                "movb   %%al, %%bl\n"
-                "shrl   $8, %%eax\n"
-                "xorb   (%%esi), %%bl\n"
-                "xorl   (%%edi,%%ebx,4), %%eax\n"
-
-                "decl   %%ecx\n"
-                "jz     2f\n"
-
-                "movb   %%al, %%bl\n"
-                "shrl   $8, %%eax\n"
-                "xorb   1(%%esi), %%bl\n"
-                "xorl   (%%edi,%%ebx,4), %%eax\n"
-
-                "decl   %%ecx\n"
-                "jz     2f\n"
-
-                "movb   %%al, %%bl\n"
-                "shrl   $8, %%eax\n"
-                "xorb   2(%%esi), %%bl\n"
-                "xorl   (%%edi,%%ebx,4), %%eax\n"
-        "2:\n"
-                : "=a" (_crc)
-                : "0" (_crc), "g" (p), "g" (len)
-                : "bx", "cx", "dx", "si", "di"
-        );
-
-        return  _crc;
-}
-
-#else   /* ASM_CRC */
-
 static u32
 calc_crc32( u32  crc,  u8  *p,  u32  len )
 {
@@ -1642,9 +1556,6 @@ calc_crc32( u32  crc,  u8  *p,  u32  len )
         return  crc;
 }
 
-#endif  /* ASM_CRC */
-
-
 static u32  crc32tab[] __attribute__ ((aligned(8))) = {
         0xD202EF8D,  0xA505DF1B,  0x3C0C8EA1,  0x4B0BBE37,
         0xD56F2B94,  0xA2681B02,  0x3B614AB8,  0x4C667A2E,
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index 55b8dec86233..08ae01b41c83 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -169,6 +169,7 @@ struct xenvif {
         unsigned long   credit_usec;
         unsigned long   remaining_credit;
         struct timer_list credit_timeout;
+        u64 credit_window_start;
 
         /* Statistics */
         unsigned long rx_gso_checksum_fixup;
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index e4aa26748f80..b78ee10a956a 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -316,8 +316,7 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
         vif->credit_bytes = vif->remaining_credit = ~0UL;
         vif->credit_usec  = 0UL;
         init_timer(&vif->credit_timeout);
-        /* Initialize 'expires' now: it's used to track the credit window. */
-        vif->credit_timeout.expires = jiffies;
+        vif->credit_window_start = get_jiffies_64();
 
         dev->netdev_ops = &xenvif_netdev_ops;
         dev->hw_features = NETIF_F_SG |
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 828fdab4f1a4..919b6509455c 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1380,9 +1380,8 @@ static int checksum_setup(struct xenvif *vif, struct sk_buff *skb)
 
 static bool tx_credit_exceeded(struct xenvif *vif, unsigned size)
 {
-        unsigned long now = jiffies;
-        unsigned long next_credit =
-                vif->credit_timeout.expires +
+        u64 now = get_jiffies_64();
+        u64 next_credit = vif->credit_window_start +
                 msecs_to_jiffies(vif->credit_usec / 1000);
 
         /* Timer could already be pending in rare cases. */
@@ -1390,8 +1389,8 @@ static bool tx_credit_exceeded(struct xenvif *vif, unsigned size)
                 return true;
 
         /* Passed the point where we can replenish credit? */
-        if (time_after_eq(now, next_credit)) {
-                vif->credit_timeout.expires = now;
+        if (time_after_eq64(now, next_credit)) {
+                vif->credit_window_start = now;
                 tx_add_credit(vif);
         }
 
@@ -1403,6 +1402,7 @@ static bool tx_credit_exceeded(struct xenvif *vif, unsigned size)
                         tx_credit_callback;
                 mod_timer(&vif->credit_timeout,
                           next_credit);
+                vif->credit_window_start = next_credit;
 
                 return true;
         }