13 files changed, 39 insertions, 217 deletions

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index a822e70c2af3..f2af87d70594 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -3386,32 +3386,6 @@ err_disable_device:
 }
 
 /*****************************************************************************/
-static int ena_sriov_configure(struct pci_dev *dev, int numvfs)
-{
-        int rc;
-
-        if (numvfs > 0) {
-                rc = pci_enable_sriov(dev, numvfs);
-                if (rc != 0) {
-                        dev_err(&dev->dev,
-                                "pci_enable_sriov failed to enable: %d vfs with the error: %d\n",
-                                numvfs, rc);
-                        return rc;
-                }
-
-                return numvfs;
-        }
-
-        if (numvfs == 0) {
-                pci_disable_sriov(dev);
-                return 0;
-        }
-
-        return -EINVAL;
-}
-
-/*****************************************************************************/
-/*****************************************************************************/
 
 /* ena_remove - Device Removal Routine
  * @pdev: PCI device information struct
@@ -3526,7 +3500,7 @@ static struct pci_driver ena_pci_driver = {
         .suspend    = ena_suspend,
         .resume     = ena_resume,
 #endif
-        .sriov_configure = ena_sriov_configure,
+        .sriov_configure = pci_sriov_configure_simple,
 };
 
 static int __init ena_init(void)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index c766ae23bc74..5b1ed240bf18 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -13922,8 +13922,6 @@ static int bnx2x_init_one(struct pci_dev *pdev,
 {
         struct net_device *dev = NULL;
         struct bnx2x *bp;
-        enum pcie_link_width pcie_width;
-        enum pci_bus_speed pcie_speed;
         int rc, max_non_def_sbs;
         int rx_count, tx_count, rss_count, doorbell_size;
         int max_cos_est;
@@ -14091,21 +14089,12 @@ static int bnx2x_init_one(struct pci_dev *pdev,
                 dev_addr_add(bp->dev, bp->fip_mac, NETDEV_HW_ADDR_T_SAN);
                 rtnl_unlock();
         }
-        if (pcie_get_minimum_link(bp->pdev, &pcie_speed, &pcie_width) ||
-            pcie_speed == PCI_SPEED_UNKNOWN ||
-            pcie_width == PCIE_LNK_WIDTH_UNKNOWN)
-                BNX2X_DEV_INFO("Failed to determine PCI Express Bandwidth\n");
-        else
-                BNX2X_DEV_INFO(
-                       "%s (%c%d) PCI-E x%d %s found at mem %lx, IRQ %d, node addr %pM\n",
-                       board_info[ent->driver_data].name,
-                       (CHIP_REV(bp) >> 12) + 'A', (CHIP_METAL(bp) >> 4),
-                       pcie_width,
-                       pcie_speed == PCIE_SPEED_2_5GT ? "2.5GHz" :
-                       pcie_speed == PCIE_SPEED_5_0GT ? "5.0GHz" :
-                       pcie_speed == PCIE_SPEED_8_0GT ? "8.0GHz" :
-                       "Unknown",
-                       dev->base_addr, bp->pdev->irq, dev->dev_addr);
+        BNX2X_DEV_INFO(
+               "%s (%c%d) PCI-E found at mem %lx, IRQ %d, node addr %pM\n",
+               board_info[ent->driver_data].name,
+               (CHIP_REV(bp) >> 12) + 'A', (CHIP_METAL(bp) >> 4),
+               dev->base_addr, bp->pdev->irq, dev->dev_addr);
+        pcie_print_link_status(bp->pdev);
 
         bnx2x_register_phc(bp);
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index dfa0839f6656..176fc9f4d7de 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -8685,22 +8685,6 @@ static int bnxt_init_mac_addr(struct bnxt *bp)
         return rc;
 }
 
-static void bnxt_parse_log_pcie_link(struct bnxt *bp)
-{
-        enum pcie_link_width width = PCIE_LNK_WIDTH_UNKNOWN;
-        enum pci_bus_speed speed = PCI_SPEED_UNKNOWN;
-
-        if (pcie_get_minimum_link(pci_physfn(bp->pdev), &speed, &width) ||
-            speed == PCI_SPEED_UNKNOWN || width == PCIE_LNK_WIDTH_UNKNOWN)
-                netdev_info(bp->dev, "Failed to determine PCIe Link Info\n");
-        else
-                netdev_info(bp->dev, "PCIe: Speed %s Width x%d\n",
-                            speed == PCIE_SPEED_2_5GT ? "2.5GT/s" :
-                            speed == PCIE_SPEED_5_0GT ? "5.0GT/s" :
-                            speed == PCIE_SPEED_8_0GT ? "8.0GT/s" :
-                            "Unknown", width);
-}
-
 static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int version_printed;
@@ -8915,8 +8899,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev_info(dev, "%s found at mem %lx, node addr %pM\n",
                     board_info[ent->driver_data].name,
                     (long)pci_resource_start(pdev, 0), dev->dev_addr);
-
-        bnxt_parse_log_pcie_link(bp);
+        pcie_print_link_status(pdev);
 
         return 0;
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 0efae2030e71..35cb3ae4f7b6 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -5066,79 +5066,6 @@ static int init_rss(struct adapter *adap)
         return 0;
 }
 
-static int cxgb4_get_pcie_dev_link_caps(struct adapter *adap,
-                                        enum pci_bus_speed *speed,
-                                        enum pcie_link_width *width)
-{
-        u32 lnkcap1, lnkcap2;
-        int err1, err2;
-
-#define  PCIE_MLW_CAP_SHIFT 4   /* start of MLW mask in link capabilities */
-
-        *speed = PCI_SPEED_UNKNOWN;
-        *width = PCIE_LNK_WIDTH_UNKNOWN;
-
-        err1 = pcie_capability_read_dword(adap->pdev, PCI_EXP_LNKCAP,
-                                          &lnkcap1);
-        err2 = pcie_capability_read_dword(adap->pdev, PCI_EXP_LNKCAP2,
-                                          &lnkcap2);
-        if (!err2 && lnkcap2) { /* PCIe r3.0-compliant */
-                if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
-                        *speed = PCIE_SPEED_8_0GT;
-                else if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_5_0GB)
-                        *speed = PCIE_SPEED_5_0GT;
-                else if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_2_5GB)
-                        *speed = PCIE_SPEED_2_5GT;
-        }
-        if (!err1) {
-                *width = (lnkcap1 & PCI_EXP_LNKCAP_MLW) >> PCIE_MLW_CAP_SHIFT;
-                if (!lnkcap2) { /* pre-r3.0 */
-                        if (lnkcap1 & PCI_EXP_LNKCAP_SLS_5_0GB)
-                                *speed = PCIE_SPEED_5_0GT;
-                        else if (lnkcap1 & PCI_EXP_LNKCAP_SLS_2_5GB)
-                                *speed = PCIE_SPEED_2_5GT;
-                }
-        }
-
-        if (*speed == PCI_SPEED_UNKNOWN || *width == PCIE_LNK_WIDTH_UNKNOWN)
-                return err1 ? err1 : err2 ? err2 : -EINVAL;
-        return 0;
-}
-
-static void cxgb4_check_pcie_caps(struct adapter *adap)
-{
-        enum pcie_link_width width, width_cap;
-        enum pci_bus_speed speed, speed_cap;
-
-#define PCIE_SPEED_STR(speed) \
-        (speed == PCIE_SPEED_8_0GT ? "8.0GT/s" : \
-         speed == PCIE_SPEED_5_0GT ? "5.0GT/s" : \
-         speed == PCIE_SPEED_2_5GT ? "2.5GT/s" : \
-         "Unknown")
-
-        if (cxgb4_get_pcie_dev_link_caps(adap, &speed_cap, &width_cap)) {
-                dev_warn(adap->pdev_dev,
-                         "Unable to determine PCIe device BW capabilities\n");
-                return;
-        }
-
-        if (pcie_get_minimum_link(adap->pdev, &speed, &width) ||
-            speed == PCI_SPEED_UNKNOWN || width == PCIE_LNK_WIDTH_UNKNOWN) {
-                dev_warn(adap->pdev_dev,
-                         "Unable to determine PCI Express bandwidth.\n");
-                return;
-        }
-
-        dev_info(adap->pdev_dev, "PCIe link speed is %s, device supports %s\n",
-                 PCIE_SPEED_STR(speed), PCIE_SPEED_STR(speed_cap));
-        dev_info(adap->pdev_dev, "PCIe link width is x%d, device supports x%d\n",
-                 width, width_cap);
-        if (speed < speed_cap || width < width_cap)
-                dev_info(adap->pdev_dev,
-                         "A slot with more lanes and/or higher speed is "
-                         "suggested for optimal performance.\n");
-}
-
 /* Dump basic information about the adapter */
 static void print_adapter_info(struct adapter *adapter)
 {
@@ -5798,7 +5725,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         /* check for PCI Express bandwidth capabiltites */
-        cxgb4_check_pcie_caps(adapter);
+        pcie_print_link_status(pdev);
 
         err = init_rss(adapter);
         if (err)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 38b4e4899490..4929f7265598 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -245,9 +245,6 @@ static void ixgbe_check_minimum_link(struct ixgbe_adapter *adapter,
                                      int expected_gts)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-        int max_gts = 0;
-        enum pci_bus_speed speed = PCI_SPEED_UNKNOWN;
-        enum pcie_link_width width = PCIE_LNK_WIDTH_UNKNOWN;
         struct pci_dev *pdev;
 
         /* Some devices are not connected over PCIe and thus do not negotiate
@@ -263,49 +260,7 @@ static void ixgbe_check_minimum_link(struct ixgbe_adapter *adapter,
         else
                 pdev = adapter->pdev;
 
-        if (pcie_get_minimum_link(pdev, &speed, &width) ||
-            speed == PCI_SPEED_UNKNOWN || width == PCIE_LNK_WIDTH_UNKNOWN) {
-                e_dev_warn("Unable to determine PCI Express bandwidth.\n");
-                return;
-        }
-
-        switch (speed) {
-        case PCIE_SPEED_2_5GT:
-                /* 8b/10b encoding reduces max throughput by 20% */
-                max_gts = 2 * width;
-                break;
-        case PCIE_SPEED_5_0GT:
-                /* 8b/10b encoding reduces max throughput by 20% */
-                max_gts = 4 * width;
-                break;
-        case PCIE_SPEED_8_0GT:
-                /* 128b/130b encoding reduces throughput by less than 2% */
-                max_gts = 8 * width;
-                break;
-        default:
-                e_dev_warn("Unable to determine PCI Express bandwidth.\n");
-                return;
-        }
-
-        e_dev_info("PCI Express bandwidth of %dGT/s available\n",
-                   max_gts);
-        e_dev_info("(Speed:%s, Width: x%d, Encoding Loss:%s)\n",
-                   (speed == PCIE_SPEED_8_0GT ? "8.0GT/s" :
-                    speed == PCIE_SPEED_5_0GT ? "5.0GT/s" :
-                    speed == PCIE_SPEED_2_5GT ? "2.5GT/s" :
-                    "Unknown"),
-                   width,
-                   (speed == PCIE_SPEED_2_5GT ? "20%" :
-                    speed == PCIE_SPEED_5_0GT ? "20%" :
-                    speed == PCIE_SPEED_8_0GT ? "<2%" :
-                    "Unknown"));
-
-        if (max_gts < expected_gts) {
-                e_dev_warn("This is not sufficient for optimal performance of this card.\n");
-                e_dev_warn("For optimal performance, at least %dGT/s of bandwidth is required.\n",
-                        expected_gts);
-                e_dev_warn("A slot with more lanes and/or higher speed is suggested.\n");
-        }
+        pcie_print_link_status(pdev);
 }
 
 static void ixgbe_service_event_schedule(struct ixgbe_adapter *adapter)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 6cab1dd66d1b..f63dfbcd29fe 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -2104,21 +2104,18 @@ static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev,
         struct mlx5_vport *vport = &esw->vports[vport_idx];
         u64 rx_discard_vport_down, tx_discard_vport_down;
         u64 bytes = 0;
-        u16 idx = 0;
         int err = 0;
 
         if (!vport->enabled || esw->mode != SRIOV_LEGACY)
                 return 0;
 
-        if (vport->egress.drop_counter) {
-                idx = vport->egress.drop_counter->id;
-                mlx5_fc_query(dev, idx, &stats->rx_dropped, &bytes);
-        }
+        if (vport->egress.drop_counter)
+                mlx5_fc_query(dev, vport->egress.drop_counter,
+                              &stats->rx_dropped, &bytes);
 
-        if (vport->ingress.drop_counter) {
-                idx = vport->ingress.drop_counter->id;
-                mlx5_fc_query(dev, idx, &stats->tx_dropped, &bytes);
-        }
+        if (vport->ingress.drop_counter)
+                mlx5_fc_query(dev, vport->ingress.drop_counter,
+                              &stats->tx_dropped, &bytes);
 
         if (!MLX5_CAP_GEN(dev, receive_discard_vport_down) &&
             !MLX5_CAP_GEN(dev, transmit_discard_vport_down))
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index e1b609c61d59..49a75d31185e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -325,7 +325,8 @@ static bool check_valid_mask(u8 match_criteria_enable, const u32 *match_criteria
         if (match_criteria_enable & ~(
                 (1 << MLX5_CREATE_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_OUTER_HEADERS)   |
                 (1 << MLX5_CREATE_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_MISC_PARAMETERS) |
-                (1 << MLX5_CREATE_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_INNER_HEADERS)))
+                (1 << MLX5_CREATE_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_INNER_HEADERS) |
+                (1 << MLX5_CREATE_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_MISC_PARAMETERS_2)))
                 return false;
 
         if (!(match_criteria_enable &
@@ -361,6 +362,17 @@ static bool check_valid_mask(u8 match_criteria_enable, const u32 *match_criteria
                         return false;
         }
 
+        if (!(match_criteria_enable &
+              1 << MLX5_CREATE_FLOW_GROUP_IN_MATCH_CRITERIA_ENABLE_MISC_PARAMETERS_2)) {
+                char *fg_type_mask = MLX5_ADDR_OF(fte_match_param,
+                                                  match_criteria, misc_parameters_2);
+
+                if (fg_type_mask[0] ||
+                    memcmp(fg_type_mask, fg_type_mask + 1,
+                           MLX5_ST_SZ_BYTES(fte_match_set_misc2) - 1))
+                        return false;
+        }
+
         return check_last_reserved(match_criteria);
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
index e26d3e9d5f9f..32070e5d993d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
@@ -159,7 +159,7 @@ struct mlx5_ft_underlay_qp {
         u32 qpn;
 };
 
-#define MLX5_FTE_MATCH_PARAM_RESERVED   reserved_at_600
+#define MLX5_FTE_MATCH_PARAM_RESERVED   reserved_at_800
 /* Calculate the fte_match_param length and without the reserved length.
  * Make sure the reserved field is the last.
  */
@@ -233,8 +233,6 @@ void mlx5_fc_queue_stats_work(struct mlx5_core_dev *dev,
                               unsigned long delay);
 void mlx5_fc_update_sampling_interval(struct mlx5_core_dev *dev,
                                       unsigned long interval);
-int mlx5_fc_query(struct mlx5_core_dev *dev, u16 id,
-                  u64 *packets, u64 *bytes);
 
 int mlx5_init_fs(struct mlx5_core_dev *dev);
 void mlx5_cleanup_fs(struct mlx5_core_dev *dev);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
index b7ab929d5f8e..58af6be13dfa 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
@@ -243,6 +243,7 @@ err_out:
 
         return ERR_PTR(err);
 }
+EXPORT_SYMBOL(mlx5_fc_create);
 
 void mlx5_fc_destroy(struct mlx5_core_dev *dev, struct mlx5_fc *counter)
 {
@@ -260,6 +261,7 @@ void mlx5_fc_destroy(struct mlx5_core_dev *dev, struct mlx5_fc *counter)
         mlx5_cmd_fc_free(dev, counter->id);
         kfree(counter);
 }
+EXPORT_SYMBOL(mlx5_fc_destroy);
 
 int mlx5_init_fc_stats(struct mlx5_core_dev *dev)
 {
@@ -312,11 +314,12 @@ void mlx5_cleanup_fc_stats(struct mlx5_core_dev *dev)
         }
 }
 
-int mlx5_fc_query(struct mlx5_core_dev *dev, u16 id,
+int mlx5_fc_query(struct mlx5_core_dev *dev, struct mlx5_fc *counter,
                   u64 *packets, u64 *bytes)
 {
-        return mlx5_cmd_fc_query(dev, id, packets, bytes);
+        return mlx5_cmd_fc_query(dev, counter->id, packets, bytes);
 }
+EXPORT_SYMBOL(mlx5_fc_query);
 
 void mlx5_fc_query_cached(struct mlx5_fc *counter,
                           u64 *bytes, u64 *packets, u64 *lastuse)
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 99d8e7398a5b..23304aca25f9 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -189,7 +189,6 @@ struct netvsc_device;
 struct net_device_context;
 
 extern u32 netvsc_ring_bytes;
-extern struct reciprocal_value netvsc_ring_reciprocal;
 
 struct netvsc_device *netvsc_device_add(struct hv_device *device,
                                         const struct netvsc_device_info *info);
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index d2ee66c259a7..5d5bd513847f 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -31,7 +31,6 @@
 #include <linux/vmalloc.h>
 #include <linux/rtnetlink.h>
 #include <linux/prefetch.h>
-#include <linux/reciprocal_div.h>
 
 #include <asm/sync_bitops.h>
 
@@ -635,17 +634,6 @@ void netvsc_device_remove(struct hv_device *device)
 #define RING_AVAIL_PERCENT_HIWATER 20
 #define RING_AVAIL_PERCENT_LOWATER 10
 
-/*
- * Get the percentage of available bytes to write in the ring.
- * The return value is in range from 0 to 100.
- */
-static u32 hv_ringbuf_avail_percent(const struct hv_ring_buffer_info *ring_info)
-{
-        u32 avail_write = hv_get_bytes_to_write(ring_info);
-
-        return reciprocal_divide(avail_write  * 100, netvsc_ring_reciprocal);
-}
-
 static inline void netvsc_free_send_slot(struct netvsc_device *net_device,
                                          u32 index)
 {
@@ -694,8 +682,8 @@ static void netvsc_send_tx_complete(struct net_device *ndev,
                 struct netdev_queue *txq = netdev_get_tx_queue(ndev, q_idx);
 
                 if (netif_tx_queue_stopped(txq) &&
-                    (hv_ringbuf_avail_percent(&channel->outbound) > RING_AVAIL_PERCENT_HIWATER ||
-                     queue_sends < 1)) {
+                    (hv_get_avail_to_write_percent(&channel->outbound) >
+                     RING_AVAIL_PERCENT_HIWATER || queue_sends < 1)) {
                         netif_tx_wake_queue(txq);
                         ndev_ctx->eth_stats.wake_queue++;
                 }
@@ -802,7 +790,7 @@ static inline int netvsc_send_pkt(
         struct netdev_queue *txq = netdev_get_tx_queue(ndev, packet->q_idx);
         u64 req_id;
         int ret;
-        u32 ring_avail = hv_ringbuf_avail_percent(&out_channel->outbound);
+        u32 ring_avail = hv_get_avail_to_write_percent(&out_channel->outbound);
 
         nvmsg.hdr.msg_type = NVSP_MSG1_TYPE_SEND_RNDIS_PKT;
         if (skb)
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 8eec156418ea..7b18a8c267c2 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -35,7 +35,6 @@
 #include <linux/slab.h>
 #include <linux/rtnetlink.h>
 #include <linux/netpoll.h>
-#include <linux/reciprocal_div.h>
 
 #include <net/arp.h>
 #include <net/route.h>
@@ -59,7 +58,6 @@ static unsigned int ring_size __ro_after_init = 128;
 module_param(ring_size, uint, 0444);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
 unsigned int netvsc_ring_bytes __ro_after_init;
-struct reciprocal_value netvsc_ring_reciprocal __ro_after_init;
 
 static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |
                                 NETIF_MSG_LINK | NETIF_MSG_IFUP |
@@ -2132,7 +2130,6 @@ static int __init netvsc_drv_init(void)
                         ring_size);
         }
         netvsc_ring_bytes = ring_size * PAGE_SIZE;
-        netvsc_ring_reciprocal = reciprocal_value(netvsc_ring_bytes);
 
         ret = vmbus_driver_register(&netvsc_drv);
         if (ret)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 4dd0668003e7..679da1abd73c 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -564,7 +564,7 @@ static u16 xennet_select_queue(struct net_device *dev, struct sk_buff *skb,
 
 #define MAX_XEN_SKB_FRAGS (65536 / XEN_PAGE_SIZE + 1)
 
-static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct netfront_info *np = netdev_priv(dev);
         struct netfront_stats *tx_stats = this_cpu_ptr(np->tx_stats);