diff options
| author | Yuval Mintz | 2013-01-14 06:11:45 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-01-15 21:07:58 +0100 |
| commit | 4ba7699be9e038b3f4d4857ef5d2150ebd9a7b60 (patch) | |
| tree | 075a9a5fee8b80803686801d5f03176a96510941 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |
| parent | bnx2x: Fix rare self-test failures (diff) | |
| download | kernel-qcow2-linux-4ba7699be9e038b3f4d4857ef5d2150ebd9a7b60.tar.gz kernel-qcow2-linux-4ba7699be9e038b3f4d4857ef5d2150ebd9a7b60.tar.xz kernel-qcow2-linux-4ba7699be9e038b3f4d4857ef5d2150ebd9a7b60.zip | |
bnx2x: Added nvram personalities support
When a device is configured to act as either iscsi or fcoe
device in its nvram, prevent the other from being misused by
preventing its activation in the driver.
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 4c91f3bf4d3b..f4d4896d71f3 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -10570,6 +10570,13 @@ static void bnx2x_get_port_hwinfo(struct bnx2x *bp) bp->wol = (!(bp->flags & NO_WOL_FLAG) && (config & PORT_FEATURE_WOL_ENABLED)); + if ((config & PORT_FEAT_CFG_STORAGE_PERSONALITY_MASK) == + PORT_FEAT_CFG_STORAGE_PERSONALITY_FCOE && !IS_MF(bp)) + bp->flags |= NO_ISCSI_FLAG; + if ((config & PORT_FEAT_CFG_STORAGE_PERSONALITY_MASK) == + PORT_FEAT_CFG_STORAGE_PERSONALITY_ISCSI && !(IS_MF(bp))) + bp->flags |= NO_FCOE_FLAG; + BNX2X_DEV_INFO("lane_config 0x%08x speed_cap_mask0 0x%08x link_config0 0x%08x\n", bp->link_params.lane_config, bp->link_params.speed_cap_mask[0], |