diff options
| author |   Yuval Mintz <Yuval.Mintz@qlogic.com> | 2016-03-15 19:52:04 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-18 19:17:16 -0400 |
| commit | 1e6bb1a3540fec3ef112b9a89dda88e684c3ff59 (patch) | |
| tree | 9af4fcb2dcaf852adb567f0441e46f72e8ee5d6a /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |
| parent | ravb: fix result value overwrite (diff) | |
| download | linux-dev-1e6bb1a3540fec3ef112b9a89dda88e684c3ff59.tar.xz linux-dev-1e6bb1a3540fec3ef112b9a89dda88e684c3ff59.zip | |
bnx2x: Prevent false warning for lack of FC NPIV
Not all adapters have FC-NPIV configured. If bnx2fc is used with such an
adapter, driver would read irrelevant data from the the nvram and log
"FC-NPIV table with bad length..." In system logs.
Simply accept that reading '0' as the feature offset in nvram indicates
the feature isn't there and return.
Reported-by: Andrew Patterson <andrew.patterson@hpe.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index b597c32275aa..d465bd721146 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -14885,6 +14885,10 @@ static int bnx2x_get_fc_npiv(struct net_device *dev, } offset = SHMEM2_RD(bp, fc_npiv_nvram_tbl_addr[BP_PORT(bp)]); + if (!offset) { + DP(BNX2X_MSG_MCP, "No FC-NPIV in NVRAM\n"); + goto out; + } DP(BNX2X_MSG_MCP, "Offset of FC-NPIV in NVRAM: %08x\n", offset); /* Read the table contents from nvram */ |