* [PATCH net] bnx2x: fix encapsulation features on 57710/57711
@ 2015-03-16 15:15 Michal Schmidt
2015-03-16 21:06 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Michal Schmidt @ 2015-03-16 15:15 UTC (permalink / raw)
To: netdev; +Cc: Yuval Mintz, Dmitry Kravkov, Ariel Elior, Eren Türkay
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>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index bef750a090..996e215fc3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -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 =
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] bnx2x: fix encapsulation features on 57710/57711
2015-03-16 15:15 [PATCH net] bnx2x: fix encapsulation features on 57710/57711 Michal Schmidt
@ 2015-03-16 21:06 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-03-16 21:06 UTC (permalink / raw)
To: mschmidt; +Cc: netdev, Yuval.Mintz, Dmitry.Kravkov, Ariel.Elior, erent
From: Michal Schmidt <mschmidt@redhat.com>
Date: Mon, 16 Mar 2015 16:15:59 +0100
> 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>
Applied, thanks a lot Michal.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-16 21:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-16 15:15 [PATCH net] bnx2x: fix encapsulation features on 57710/57711 Michal Schmidt
2015-03-16 21:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).