|
 |
3828ce |
From 233fd923ea4759062abb3c26493beea638264c72 Mon Sep 17 00:00:00 2001
|
|
|
3828ce |
From: Petr Oros <poros@redhat.com>
|
|
|
3828ce |
Date: Wed, 13 Jul 2016 18:33:14 +0200
|
|
|
3828ce |
Subject: [PATCH] bnx2x: backport for RHEL7.2GA kernel
|
|
|
3828ce |
|
|
|
3828ce |
Signed-off-by: Petr Oros <poros@redhat.com>
|
|
|
3828ce |
---
|
|
|
3828ce |
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 15 +++------------
|
|
|
3828ce |
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 5 +----
|
|
|
3828ce |
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 +++++-----
|
|
|
3828ce |
3 files changed, 9 insertions(+), 21 deletions(-)
|
|
|
3828ce |
|
|
|
ddba73 |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
|
|
3828ce |
index 07e88de..860c1fb 100644
|
|
|
ddba73 |
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
|
|
ddba73 |
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
|
|
3828ce |
@@ -678,7 +678,7 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
|
|
|
3828ce |
static void bnx2x_frag_free(const struct bnx2x_fastpath *fp, void *data)
|
|
|
3828ce |
{
|
|
|
3828ce |
if (fp->rx_frag_size)
|
|
|
3828ce |
- skb_free_frag(data);
|
|
|
3828ce |
+ put_page(virt_to_head_page(data));
|
|
|
3828ce |
else
|
|
|
3828ce |
kfree(data);
|
|
|
3828ce |
}
|
|
|
3828ce |
@@ -1908,8 +1908,7 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)
|
|
|
3828ce |
bnx2x_napi_disable_cnic(bp);
|
|
|
3828ce |
}
|
|
|
ddba73 |
|
|
|
3828ce |
-u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
|
|
|
3828ce |
- void *accel_priv, select_queue_fallback_t fallback)
|
|
|
3828ce |
+u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb)
|
|
|
3828ce |
{
|
|
|
3828ce |
struct bnx2x *bp = netdev_priv(dev);
|
|
|
ddba73 |
|
|
|
3828ce |
@@ -1931,7 +1930,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
|
|
|
ddba73 |
}
|
|
|
3828ce |
|
|
|
3828ce |
/* select a non-FCoE queue */
|
|
|
3828ce |
- return fallback(dev, skb) % BNX2X_NUM_ETH_QUEUES(bp);
|
|
|
3828ce |
+ return __netdev_pick_tx(dev, skb) % BNX2X_NUM_ETH_QUEUES(bp);
|
|
|
3828ce |
}
|
|
|
3828ce |
|
|
|
3828ce |
void bnx2x_set_num_queues(struct bnx2x *bp)
|
|
|
3828ce |
@@ -4276,14 +4275,6 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
|
|
|
3828ce |
return 0;
|
|
|
ddba73 |
}
|
|
|
ddba73 |
|
|
|
3828ce |
-int __bnx2x_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
|
|
|
3828ce |
- struct tc_to_netdev *tc)
|
|
|
3828ce |
-{
|
|
|
3828ce |
- if (tc->type != TC_SETUP_MQPRIO)
|
|
|
3828ce |
- return -EINVAL;
|
|
|
3828ce |
- return bnx2x_setup_tc(dev, tc->tc);
|
|
|
3828ce |
-}
|
|
|
3828ce |
-
|
|
|
3828ce |
/* called with rtnl_lock */
|
|
|
3828ce |
int bnx2x_change_mac_addr(struct net_device *dev, void *p)
|
|
|
ddba73 |
{
|
|
|
3828ce |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
|
|
|
3828ce |
index 0e68fad..cabbb1c 100644
|
|
|
3828ce |
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
|
|
|
3828ce |
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
|
|
|
3828ce |
@@ -486,8 +486,6 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
|
|
3828ce |
|
|
|
3828ce |
/* setup_tc callback */
|
|
|
3828ce |
int bnx2x_setup_tc(struct net_device *dev, u8 num_tc);
|
|
|
3828ce |
-int __bnx2x_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
|
|
|
3828ce |
- struct tc_to_netdev *tc);
|
|
|
3828ce |
|
|
|
3828ce |
int bnx2x_get_vf_config(struct net_device *dev, int vf,
|
|
|
3828ce |
struct ifla_vf_info *ivi);
|
|
|
3828ce |
@@ -495,8 +493,7 @@ int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac);
|
|
|
3828ce |
int bnx2x_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos);
|
|
|
3828ce |
|
|
|
3828ce |
/* select_queue callback */
|
|
|
3828ce |
-u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
|
|
|
3828ce |
- void *accel_priv, select_queue_fallback_t fallback);
|
|
|
3828ce |
+u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb);
|
|
|
3828ce |
|
|
|
3828ce |
static inline void bnx2x_update_rx_prod(struct bnx2x *bp,
|
|
|
3828ce |
struct bnx2x_fastpath *fp,
|
|
|
ddba73 |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
|
|
3828ce |
index 3d8261e..440750a 100644
|
|
|
ddba73 |
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
|
|
ddba73 |
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
|
|
3828ce |
@@ -77,9 +77,9 @@
|
|
|
3828ce |
__stringify(BCM_5710_FW_MINOR_VERSION) "." \
|
|
|
3828ce |
__stringify(BCM_5710_FW_REVISION_VERSION) "." \
|
|
|
3828ce |
__stringify(BCM_5710_FW_ENGINEERING_VERSION)
|
|
|
3828ce |
-#define FW_FILE_NAME_E1 "bnx2x/bnx2x-e1-" FW_FILE_VERSION ".fw"
|
|
|
3828ce |
-#define FW_FILE_NAME_E1H "bnx2x/bnx2x-e1h-" FW_FILE_VERSION ".fw"
|
|
|
3828ce |
-#define FW_FILE_NAME_E2 "bnx2x/bnx2x-e2-" FW_FILE_VERSION ".fw"
|
|
|
3828ce |
+#define FW_FILE_NAME_E1 "bnx2x-e1-" FW_FILE_VERSION ".fw"
|
|
|
3828ce |
+#define FW_FILE_NAME_E1H "bnx2x-e1h-" FW_FILE_VERSION ".fw"
|
|
|
3828ce |
+#define FW_FILE_NAME_E2 "bnx2x-e2-" FW_FILE_VERSION ".fw"
|
|
|
3828ce |
|
|
|
3828ce |
/* Time in jiffies before concluding the transmitter is hung */
|
|
|
3828ce |
#define TX_TIMEOUT (5*HZ)
|
|
|
3828ce |
@@ -12859,7 +12859,7 @@ static int bnx2x_validate_addr(struct net_device *dev)
|
|
|
3828ce |
}
|
|
|
3828ce |
|
|
|
3828ce |
static int bnx2x_get_phys_port_id(struct net_device *netdev,
|
|
|
3828ce |
- struct netdev_phys_item_id *ppid)
|
|
|
3828ce |
+ struct netdev_phys_port_id *ppid)
|
|
|
3828ce |
{
|
|
|
3828ce |
struct bnx2x *bp = netdev_priv(netdev);
|
|
|
ddba73 |
|
|
|
3828ce |
@@ -13034,7 +13034,7 @@ static const struct net_device_ops bnx2x_netdev_ops = {
|
|
|
3828ce |
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
3828ce |
.ndo_poll_controller = poll_bnx2x,
|
|
|
3828ce |
#endif
|
|
|
3828ce |
- .ndo_setup_tc = __bnx2x_setup_tc,
|
|
|
3828ce |
+ .ndo_setup_tc = bnx2x_setup_tc,
|
|
|
3828ce |
#ifdef CONFIG_BNX2X_SRIOV
|
|
|
3828ce |
.ndo_set_vf_mac = bnx2x_set_vf_mac,
|
|
|
3828ce |
.ndo_set_vf_vlan = bnx2x_set_vf_vlan,
|
|
|
3828ce |
--
|
|
|
3828ce |
1.8.3.1
|
|
|
3828ce |
|