Commit a8e0c246 authored Mar 16, 2015 by Michal Schmidt Committed by David S. Miller Mar 16, 2015

bnx2x: fix encapsulation features on 57710/57711



E1x chips (57710, 57711(E)) have no support for encapsulation
offload. bnx2x incorrectly advertises the support as available.

Setting of those features is conditional on "!CHIP_IS_E1x(bp)", but
the bp struct is not initialized yet at this point and consequently
any chip passes the check.
The check must use the "chip_is_e1x" local variable instead to work
correctly.

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 48b810d9

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -12769,7 +12769,7 @@ static int bnx2x_init_dev(struct bnx2x bp, struct pci_dev pdev,
		NETIF_F_TSO \| NETIF_F_TSO_ECN \| NETIF_F_TSO6 \|
		NETIF_F_RXCSUM \| NETIF_F_LRO \| NETIF_F_GRO \|
		NETIF_F_RXHASH \| NETIF_F_HW_VLAN_CTAG_TX;
		if (!CHIP_IS_E1x(bp)) {
		if (!chip_is_e1x) {
		dev->hw_features \|= NETIF_F_GSO_GRE \| NETIF_F_GSO_UDP_TUNNEL \|
		NETIF_F_GSO_IPIP \| NETIF_F_GSO_SIT;
		dev->hw_enc_features =