xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Pull in bug fixes before respinning my net-next pull
request.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2018-12-24 16:19:56 -08:00
parent c92c81df93 38355a5f9a
commit 90cadbbf34
6 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@@ -9360,10 +9360,16 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode, bool keep_link)
BNX2X_ERR("Failed to schedule DEL commands for UC MACs list: %d\n",
rc);
/* Remove all currently configured VLANs */
rc = bnx2x_del_all_vlans(bp);
if (rc < 0)
BNX2X_ERR("Failed to delete all VLANs\n");
/* The whole *vlan_obj structure may be not initialized if VLAN
* filtering offload is not supported by hardware. Currently this is
* true for all hardware covered by CHIP_IS_E1x().
*/
if (!CHIP_IS_E1x(bp)) {
/* Remove all currently configured VLANs */
rc = bnx2x_del_all_vlans(bp);
if (rc < 0)
BNX2X_ERR("Failed to delete all VLANs\n");
}
/* Disable LLH */
if (!CHIP_IS_E1(bp))