From 6acbc062632739cd254ac9a5f7b8f6642299b62e Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 24 Nov 2014 16:35:25 +0200 Subject: [PATCH] Refreshed backport patches for linux-3.18-rc6 Signed-off-by: Vladimir Sokolovsky --- patches/0003-BACKPORT-mlx4-core-and-en.patch | 18 ++++---- ...-Add-cxgb3-backport-patch-for-RHEL7.patch} | 39 ++++++++++++------ ...=> 0016-Backport-for-cxgbi-on-RHEL7.patch} | 15 ++++++- ...4-add-ofed-suffix-to-driver-version.patch} | 15 ++++--- ...8-cxgb4-bundle-firmware-with-driver.patch} | 26 ++++++++---- ...gb4-backport-changes-for-linux-3.12.patch} | 41 ++++++++++++------- 6 files changed, 101 insertions(+), 53 deletions(-) rename patches/{0015-BACKPORT-cxgb3.patch => 0015-Add-cxgb3-backport-patch-for-RHEL7.patch} (51%) rename patches/{0017-BACKPORT-cxgbi-Kbuild.patch => 0016-Backport-for-cxgbi-on-RHEL7.patch} (63%) rename patches/{0018-BACKPORT-cxgb-ofed-version.patch => 0017-cxgb3-4-add-ofed-suffix-to-driver-version.patch} (68%) rename patches/{0019-BACKPORT-cxgb4-fw.patch => 0018-cxgb4-bundle-firmware-with-driver.patch} (99%) rename patches/{0020-BACKPORT-cxgb4.patch => 0019-cxgb4-backport-changes-for-linux-3.12.patch} (82%) diff --git a/patches/0003-BACKPORT-mlx4-core-and-en.patch b/patches/0003-BACKPORT-mlx4-core-and-en.patch index 72e876c..cd76edc 100644 --- a/patches/0003-BACKPORT-mlx4-core-and-en.patch +++ b/patches/0003-BACKPORT-mlx4-core-and-en.patch @@ -236,7 +236,7 @@ index xxxxxxx..xxxxxxx xxxxxx #ifdef CONFIG_MLX4_EN_VXLAN static void mlx4_en_add_vxlan_offloads(struct work_struct *work) -@@ -2369,7 +2387,9 @@ static const struct net_device_ops mlx4_netdev_ops = { +@@ -2387,7 +2405,9 @@ static const struct net_device_ops mlx4_netdev_ops = { #ifdef CONFIG_NET_RX_BUSY_POLL .ndo_busy_poll = mlx4_en_low_latency_recv, #endif @@ -246,7 +246,7 @@ index xxxxxxx..xxxxxxx xxxxxx #ifdef CONFIG_MLX4_EN_VXLAN .ndo_add_vxlan_port = mlx4_en_add_vxlan_port, .ndo_del_vxlan_port = mlx4_en_del_vxlan_port, -@@ -2392,7 +2412,9 @@ static const struct net_device_ops mlx4_netdev_ops_master = { +@@ -2411,7 +2431,9 @@ static const struct net_device_ops mlx4_netdev_ops_master = { .ndo_set_vf_mac = mlx4_en_set_vf_mac, .ndo_set_vf_vlan = mlx4_en_set_vf_vlan, .ndo_set_vf_spoofchk = mlx4_en_set_vf_spoofchk, @@ -256,17 +256,17 @@ index xxxxxxx..xxxxxxx xxxxxx .ndo_get_vf_config = mlx4_en_get_vf_config, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = mlx4_en_netpoll, -@@ -2402,7 +2424,9 @@ static const struct net_device_ops mlx4_netdev_ops_master = { +@@ -2421,7 +2443,9 @@ static const struct net_device_ops mlx4_netdev_ops_master = { #ifdef CONFIG_RFS_ACCEL .ndo_rx_flow_steer = mlx4_en_filter_rfs, #endif +#ifdef HAVE_NETDEV_PHYS_PORT_ID .ndo_get_phys_port_id = mlx4_en_get_phys_port_id, +#endif - }; - - int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, -@@ -2423,7 +2447,9 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, + #ifdef CONFIG_MLX4_EN_VXLAN + .ndo_add_vxlan_port = mlx4_en_add_vxlan_port, + .ndo_del_vxlan_port = mlx4_en_del_vxlan_port, +@@ -2447,7 +2471,9 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, netif_set_real_num_rx_queues(dev, prof->rx_ring_num); SET_NETDEV_DEV(dev, &mdev->dev->pdev->dev); @@ -512,7 +512,7 @@ index xxxxxxx..xxxxxxx xxxxxx /* Track current inflight packets for performance analysis */ AVG_PERF_COUNTER(priv->pstats.inflight_avg, -@@ -914,7 +941,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) +@@ -917,7 +944,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) netif_tx_stop_queue(ring->tx_queue); ring->queue_stopped++; } @@ -524,7 +524,7 @@ index xxxxxxx..xxxxxxx xxxxxx real_size = (real_size / 16) & 0x3f; -@@ -953,8 +984,10 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) +@@ -956,8 +987,10 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) wmb(); iowrite32(ring->doorbell_qpn, ring->bf.uar->map + MLX4_SEND_DOORBELL); diff --git a/patches/0015-BACKPORT-cxgb3.patch b/patches/0015-Add-cxgb3-backport-patch-for-RHEL7.patch similarity index 51% rename from patches/0015-BACKPORT-cxgb3.patch rename to patches/0015-Add-cxgb3-backport-patch-for-RHEL7.patch index 3d095de..c8efd70 100644 --- a/patches/0015-BACKPORT-cxgb3.patch +++ b/patches/0015-Add-cxgb3-backport-patch-for-RHEL7.patch @@ -1,7 +1,18 @@ -diff -up a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c ---- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c 2014-11-17 09:31:15.662359767 -0600 -+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c 2014-11-17 09:55:26.747281690 -0600 -@@ -3094,10 +3094,29 @@ static int cxgb_enable_msix(struct adapt +From: Steve Wise +Subject: [PATCH] Add cxgb3 backport patch for RHEL7 + +Signed-off-by: Steve Wise +--- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 19 +++++++++++++++++++ + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 4 ++++ + drivers/net/ethernet/chelsio/cxgb3/sge.c | 9 +++++++++ + 3 files changed, 32 insertions(+), 0 deletions(-) + +diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c ++++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +@@ -3094,10 +3094,29 @@ static int cxgb_enable_msix(struct adapter *adap) for (i = 0; i < vectors; ++i) entries[i].entry = i; @@ -31,10 +42,11 @@ diff -up a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/etherne for (i = 0; i < vectors; ++i) adap->msix_info[i].vec = entries[i].vector; -diff -up a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c ---- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c 2014-11-17 09:31:15.662359767 -0600 -+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c 2014-11-17 10:08:06.085240834 -0600 -@@ -185,7 +185,11 @@ static struct net_device *get_iff_from_m +diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c ++++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +@@ -185,7 +185,11 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter, if (ether_addr_equal(dev->dev_addr, mac)) { rcu_read_lock(); if (vlan && vlan != VLAN_VID_MASK) { @@ -46,10 +58,11 @@ diff -up a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethe } else if (netif_is_bond_slave(dev)) { struct net_device *upper_dev; -diff -up a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c ---- a/drivers/net/ethernet/chelsio/cxgb3/sge.c 2014-11-17 09:31:15.664359767 -0600 -+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c 2014-11-17 09:57:35.364274770 -0600 -@@ -298,7 +298,12 @@ static void free_tx_desc(struct adapter +diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c ++++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c +@@ -298,7 +298,12 @@ static void free_tx_desc(struct adapter *adapter, struct sge_txq *q, if (need_unmap) unmap_skb(d->skb, q, cidx, pdev); if (d->eop) { @@ -62,7 +75,7 @@ diff -up a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chels d->skb = NULL; } } -@@ -1188,7 +1193,11 @@ static void write_tx_pkt_wr(struct adapt +@@ -1188,7 +1193,11 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb, cpl->wr.wr_lo = htonl(V_WR_LEN(flits) | V_WR_GEN(gen) | V_WR_TID(q->token)); wr_gen2(d, gen); diff --git a/patches/0017-BACKPORT-cxgbi-Kbuild.patch b/patches/0016-Backport-for-cxgbi-on-RHEL7.patch similarity index 63% rename from patches/0017-BACKPORT-cxgbi-Kbuild.patch rename to patches/0016-Backport-for-cxgbi-on-RHEL7.patch index a2e8935..0522010 100644 --- a/patches/0017-BACKPORT-cxgbi-Kbuild.patch +++ b/patches/0016-Backport-for-cxgbi-on-RHEL7.patch @@ -1,5 +1,16 @@ +From: Steve Wise +Subject: [PATCH] Backport for cxgbi on RHEL7 + +Just needed to tweak the Kbuild files. + +Signed-off-by: Steve Wise +--- + drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +- + drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + diff --git a/drivers/scsi/cxgbi/cxgb3i/Kbuild b/drivers/scsi/cxgbi/cxgb3i/Kbuild -index 6f095e2..5f0dc46 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/scsi/cxgbi/cxgb3i/Kbuild +++ b/drivers/scsi/cxgbi/cxgb3i/Kbuild @@ -1,3 +1,3 @@ @@ -8,7 +19,7 @@ index 6f095e2..5f0dc46 100644 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o diff --git a/drivers/scsi/cxgbi/cxgb4i/Kbuild b/drivers/scsi/cxgbi/cxgb4i/Kbuild -index 8290cda..4b00cb9 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/scsi/cxgbi/cxgb4i/Kbuild +++ b/drivers/scsi/cxgbi/cxgb4i/Kbuild @@ -1,3 +1,3 @@ diff --git a/patches/0018-BACKPORT-cxgb-ofed-version.patch b/patches/0017-cxgb3-4-add-ofed-suffix-to-driver-version.patch similarity index 68% rename from patches/0018-BACKPORT-cxgb-ofed-version.patch rename to patches/0017-cxgb3-4-add-ofed-suffix-to-driver-version.patch index aedb8e7..9098195 100644 --- a/patches/0018-BACKPORT-cxgb-ofed-version.patch +++ b/patches/0017-cxgb3-4-add-ofed-suffix-to-driver-version.patch @@ -1,11 +1,14 @@ -commit cba9df92717abd6d00e758c79fe11af97f15eed9 -Author: Steve Wise -Date: Wed Nov 19 14:44:44 2014 -0600 +From: Steve Wise +Subject: [PATCH] cxgb3/4: add "-ofed" suffix to driver version - cxgb3/4: add "-ofed" suffix to driver version +Signed-off-by: Steve Wise +--- + drivers/net/ethernet/chelsio/cxgb3/version.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h -index 165bfb9..1cfffe2 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/version.h +++ b/drivers/net/ethernet/chelsio/cxgb3/version.h @@ -35,7 +35,7 @@ @@ -18,7 +21,7 @@ index 165bfb9..1cfffe2 100644 /* Firmware version */ #define FW_VERSION_MAJOR 7 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index 578f7cd..ea34737 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -75,7 +75,7 @@ diff --git a/patches/0019-BACKPORT-cxgb4-fw.patch b/patches/0018-cxgb4-bundle-firmware-with-driver.patch similarity index 99% rename from patches/0019-BACKPORT-cxgb4-fw.patch rename to patches/0018-cxgb4-bundle-firmware-with-driver.patch index 963f0f0..1100bf8 100644 --- a/patches/0019-BACKPORT-cxgb4-fw.patch +++ b/patches/0018-cxgb4-bundle-firmware-with-driver.patch @@ -1,11 +1,19 @@ -commit 9db0b4354ad907ce64120e373b6262d54bcd5e00 -Author: Steve Wise -Date: Thu Nov 20 10:04:11 2014 -0600 +From: Steve Wise +Subject: [PATCH] cxgb4: bundle firmware with driver - cxgb4: bundle firmware with driver +Signed-off:by: Steve Wise +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 41 +- + drivers/net/ethernet/chelsio/cxgb4/t4_firmware.h | 76 + + drivers/net/ethernet/chelsio/cxgb4/t4fw.txt |32416 +++++++++++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/t5fw.txt |32576 ++++++++++++++++++++++ + 4 files changed, 65105 insertions(+), 4 deletions(-) + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_firmware.h + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4fw.txt + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t5fw.txt diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index 77d9bce..1fde975 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -69,6 +69,7 @@ @@ -16,7 +24,7 @@ index 77d9bce..1fde975 100644 #include <../drivers/net/bonding/bonding.h> -@@ -5667,12 +5668,21 @@ static struct fw_info *find_fw_info(int chip) +@@ -5671,12 +5672,21 @@ static struct fw_info *find_fw_info(int chip) return NULL; } @@ -39,7 +47,7 @@ index 77d9bce..1fde975 100644 u32 v, port_vec; enum dev_state state; u32 params[7], val[7]; -@@ -5709,7 +5719,7 @@ static int adap_init0(struct adapter *adap) +@@ -5713,7 +5723,7 @@ static int adap_init0(struct adapter *adap) if ((adap->flags & MASTER_PF) && state != DEV_STATE_INIT) { struct fw_info *fw_info; struct fw_hdr *card_fw; @@ -48,7 +56,7 @@ index 77d9bce..1fde975 100644 const u8 *fw_data = NULL; unsigned int fw_size = 0; -@@ -5732,13 +5742,34 @@ static int adap_init0(struct adapter *adap) +@@ -5736,13 +5746,34 @@ static int adap_init0(struct adapter *adap) /* Get FW from from /lib/firmware/ */ ret = request_firmware(&fw, fw_info->fw_mod_name, adap->pdev_dev); @@ -85,7 +93,7 @@ index 77d9bce..1fde975 100644 } /* upgrade FW logic */ -@@ -5748,6 +5779,8 @@ static int adap_init0(struct adapter *adap) +@@ -5752,6 +5783,8 @@ static int adap_init0(struct adapter *adap) /* Cleaning up */ if (fw != NULL) release_firmware(fw); diff --git a/patches/0020-BACKPORT-cxgb4.patch b/patches/0019-cxgb4-backport-changes-for-linux-3.12.patch similarity index 82% rename from patches/0020-BACKPORT-cxgb4.patch rename to patches/0019-cxgb4-backport-changes-for-linux-3.12.patch index 44ff6e2..66d60d3 100644 --- a/patches/0020-BACKPORT-cxgb4.patch +++ b/patches/0019-cxgb4-backport-changes-for-linux-3.12.patch @@ -1,5 +1,18 @@ +From: Steve Wise +Subject: [PATCH] cxgb4: backport changes for linux-3.12 + +Also rename the main cxgb4 backport patch so it will be applied after +the firmware patch to make changing it easier. + +Signed-off-by: Steve Wise +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 54 +++++++++++++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/sge.c | 16 +++++++ + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 + + 3 files changed, 72 insertions(+), 0 deletions(-) + diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index 1fde975..9beb804 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -71,7 +71,9 @@ @@ -12,7 +25,7 @@ index 1fde975..9beb804 100644 #ifdef DRV_VERSION #undef DRV_VERSION -@@ -1434,8 +1436,17 @@ static int del_filter_wr(struct adapter *adapter, int fidx) +@@ -1438,8 +1440,17 @@ static int del_filter_wr(struct adapter *adapter, int fidx) return 0; } @@ -30,7 +43,7 @@ index 1fde975..9beb804 100644 { int txq; -@@ -1473,7 +1484,11 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, +@@ -1477,7 +1488,11 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, return txq; } @@ -42,7 +55,7 @@ index 1fde975..9beb804 100644 } static inline int is_offload(const struct adapter *adap) -@@ -3000,6 +3015,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) +@@ -3004,6 +3019,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) return err; } @@ -50,7 +63,7 @@ index 1fde975..9beb804 100644 static u32 get_rss_table_size(struct net_device *dev) { const struct port_info *pi = netdev_priv(dev); -@@ -3028,6 +3044,7 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key) +@@ -3032,6 +3048,7 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key) return write_rss(pi, pi->rss); return 0; } @@ -58,7 +71,7 @@ index 1fde975..9beb804 100644 static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rules) -@@ -3118,9 +3135,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { +@@ -3122,9 +3139,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_wol = get_wol, .set_wol = set_wol, .get_rxnfc = get_rxnfc, @@ -70,7 +83,7 @@ index 1fde975..9beb804 100644 .flash_device = set_flash, }; -@@ -4419,20 +4438,30 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, +@@ -4423,20 +4442,30 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, struct inet6_ifaddr *ifa = data; struct net_device *event_dev; int ret = NOTIFY_DONE; @@ -101,7 +114,7 @@ index 1fde975..9beb804 100644 if (!first_pdev) { ret = clip_add(slave->dev, ifa, event); /* If clip_add is success then only initialize -@@ -4445,6 +4474,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, +@@ -4449,6 +4478,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, to_pci_dev(slave->dev->dev.parent)) ret = clip_add(slave->dev, ifa, event); } @@ -112,7 +125,7 @@ index 1fde975..9beb804 100644 } else ret = clip_add(ifa->idev->dev, ifa, event); -@@ -4455,6 +4488,7 @@ static struct notifier_block cxgb4_inet6addr_notifier = { +@@ -4459,6 +4492,7 @@ static struct notifier_block cxgb4_inet6addr_notifier = { .notifier_call = cxgb4_inet6addr_handler }; @@ -120,7 +133,7 @@ index 1fde975..9beb804 100644 /* Retrieves IPv6 addresses from a root device (bond, vlan) associated with * a physical device. * The physical device reference is needed to send the actul CLIP command. -@@ -4500,7 +4534,11 @@ static int update_root_dev_clip(struct net_device *dev) +@@ -4504,7 +4538,11 @@ static int update_root_dev_clip(struct net_device *dev) } for (i = 0; i < VLAN_N_VID; i++) { @@ -132,7 +145,7 @@ index 1fde975..9beb804 100644 if (!root_dev) continue; -@@ -6439,9 +6477,25 @@ static int enable_msix(struct adapter *adap) +@@ -6443,9 +6481,25 @@ static int enable_msix(struct adapter *adap) #else need = adap->params.nports + EXTRA_VECS + ofld_need; #endif @@ -159,7 +172,7 @@ index 1fde975..9beb804 100644 /* * Distribute available vectors to the various queue groups. diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c -index 5e1b314..09277e0 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c @@ -386,7 +386,11 @@ static void free_tx_desc(struct adapter *adap, struct sge_txq *q, @@ -213,10 +226,10 @@ index 5e1b314..09277e0 100644 rxq->stats.pkts++; diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c -index a9d9d74..ce51c80 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c -@@ -4101,7 +4101,9 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf) +@@ -4140,7 +4140,9 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf) p->lport = j; p->rss_size = rss_size; memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN); -- 2.46.0