|
 |
85383d |
From c9e14a2654f6b4cd65792844c01b2f582d430393 Mon Sep 17 00:00:00 2001
|
|
|
85383d |
From: Petr Oros <poros@redhat.com>
|
|
|
85383d |
Date: Wed, 27 Jul 2016 17:44:36 +0200
|
|
|
85383d |
Subject: [PATCH] Backport bnxt_en for RHEL7.2GA
|
|
|
85383d |
|
|
|
85383d |
Signed-off-by: Petr Oros <poros@redhat.com>
|
|
|
85383d |
---
|
|
|
85383d |
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +--------
|
|
|
85383d |
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 3 +++
|
|
|
85383d |
2 files changed, 4 insertions(+), 8 deletions(-)
|
|
|
85383d |
|
|
|
85383d |
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
|
|
|
85383d |
index e6aba37..2a95c32 100644
|
|
|
85383d |
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
|
|
|
85383d |
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
|
|
|
85383d |
@@ -6014,16 +6014,9 @@ static int bnxt_change_mtu(struct net_device *dev, int new_mtu)
|
|
|
85383d |
return 0;
|
|
|
85383d |
}
|
|
|
85383d |
|
|
|
85383d |
-static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
|
|
|
85383d |
- struct tc_to_netdev *ntc)
|
|
|
85383d |
+static int bnxt_setup_tc(struct net_device *dev, u8 tc)
|
|
|
85383d |
{
|
|
|
85383d |
struct bnxt *bp = netdev_priv(dev);
|
|
|
85383d |
- u8 tc;
|
|
|
85383d |
-
|
|
|
85383d |
- if (ntc->type != TC_SETUP_MQPRIO)
|
|
|
85383d |
- return -EINVAL;
|
|
|
85383d |
-
|
|
|
85383d |
- tc = ntc->tc;
|
|
|
85383d |
|
|
|
85383d |
if (tc > bp->max_tc) {
|
|
|
85383d |
netdev_err(dev, "too many traffic classes requested: %d Max supported is %d\n",
|
|
|
85383d |
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
|
|
|
85383d |
index 3abc03b..6af73a1 100644
|
|
|
85383d |
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
|
|
|
85383d |
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
|
|
|
85383d |
@@ -16,4 +16,7 @@ u32 _bnxt_fw_to_ethtool_adv_spds(u16, u8);
|
|
|
85383d |
u32 bnxt_fw_to_ethtool_speed(u16);
|
|
|
85383d |
u16 bnxt_get_fw_auto_link_speeds(u32);
|
|
|
85383d |
|
|
|
85383d |
+#define SPEED_25000 25000
|
|
|
85383d |
+#define SPEED_50000 50000
|
|
|
85383d |
+
|
|
|
85383d |
#endif
|
|
|
85383d |
--
|
|
|
85383d |
1.8.3.1
|
|
|
85383d |
|