diff options
author | David S. Miller <davem@davemloft.net> | 2018-09-21 09:14:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-21 09:14:21 -0700 |
commit | 957b085c793c09b86399c95086d44b2b97dbd6bb (patch) | |
tree | a77a621505c542f819db0cc56116d1bfda5eba2a /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |
parent | mISDN: remove redundant null pointer check before kfree_skb (diff) | |
parent | bnx2x: Provide VF link status in ndo_get_vf_config (diff) | |
download | linux-dev-957b085c793c09b86399c95086d44b2b97dbd6bb.tar.xz linux-dev-957b085c793c09b86399c95086d44b2b97dbd6bb.zip |
Merge branch 'bnx2x-enhancements'
Shahed Shaikh says:
====================
bnx2x: enhancements
This series adds below changes -
- support for VF spoof-check configuration through .ndo_set_vf_spoofchk.
- workaround for MFW bug regarding unexpected bandwidth notifcation
in single function mode.
- supply VF link status as part of get VF config handling.
====================
Signed-off-by: Shahed Shaikh <shahed.shaikh@cavium.com>
Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 71362b7f6040..16f64c68193d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -3536,6 +3536,16 @@ static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp) */ static void bnx2x_config_mf_bw(struct bnx2x *bp) { + /* Workaround for MFW bug. + * MFW is not supposed to generate BW attention in + * single function mode. + */ + if (!IS_MF(bp)) { + DP(BNX2X_MSG_MCP, + "Ignoring MF BW config in single function mode\n"); + return; + } + if (bp->link_vars.link_up) { bnx2x_cmng_fns_init(bp, true, CMNG_FNS_MINMAX); bnx2x_link_sync_notify(bp); @@ -13121,6 +13131,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { .ndo_set_vf_mac = bnx2x_set_vf_mac, .ndo_set_vf_vlan = bnx2x_set_vf_vlan, .ndo_get_vf_config = bnx2x_get_vf_config, + .ndo_set_vf_spoofchk = bnx2x_set_vf_spoofchk, #endif #ifdef NETDEV_FCOE_WWNN .ndo_fcoe_get_wwn = bnx2x_fcoe_get_wwn, |