diff options
| author | Yuval Mintz <Yuval.Mintz@qlogic.com> | 2015-11-15 15:02:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-16 15:13:01 -0500 |
| commit | ab6d7846cf80affc43b9d412fed5e25dfcf4f35d (patch) | |
| tree | 346346d2c9e90d750e48a4d7bada35ec48fa8783 /drivers/net/ethernet/broadcom/bnx2x | |
| parent | d60cf616ec39141b3483304fde69acf0dcec80eb (diff) | |
| download | blackbird-obmc-linux-ab6d7846cf80affc43b9d412fed5e25dfcf4f35d.tar.gz blackbird-obmc-linux-ab6d7846cf80affc43b9d412fed5e25dfcf4f35d.zip | |
bnx2x: Fix VLANs null-pointer for 57710, 57711
Commit 05cc5a39ddb7 "bnx2x: add vlan filtering offload" introduced
a regression in regard for vlans for 57710, 57711 adapters -
Loading 8021q module on a machine with such an adapter would cause
a null pointer dereference, as the driver mistakenly publishes it
has capabilities for vlan CTAG filtering.
Reported-by: Otto Sabart <osabart@redhat.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index f1d62d5dbaff..c9b036789184 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -13207,7 +13207,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, /* VF with OLD Hypervisor or old PF do not support filtering */ if (IS_PF(bp)) { - if (CHIP_IS_E1x(bp)) + if (chip_is_e1x) bp->accept_any_vlan = true; else dev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER; |
