Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c03bd39c authored by Vladislav Zolotarov's avatar Vladislav Zolotarov Committed by David S. Miller
Browse files

bnx2x: Read FIP mac from SHMEM in single function mode 



Read FIP MAC address from SHMEM's "port" section
similar to what we do in a MF mode when we read it from
a "func" section of SHMEM.

Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fea29c1

drivers/net/bnx2x/bnx2x_main.c

+9 −7
Original line number Diff line number Diff line
@@ -9251,6 +9251,12 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp) 
		val = SHMEM_RD(bp, dev_info.port_hw_config[port].

				   iscsi_mac_lower);

		bnx2x_set_mac_buf(iscsi_mac, val, val2);



		val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].

				    fcoe_fip_mac_upper);

		val = SHMEM_RD(bp, dev_info.port_hw_config[port].

				   fcoe_fip_mac_lower);

		bnx2x_set_mac_buf(fip_mac, val, val2);

#endif

	}
@@ -9258,13 +9264,9 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp) 
	memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN);



#ifdef BCM_CNIC

	/* Set the FCoE MAC in modes other then MF_SI */

	if (!CHIP_IS_E1x(bp)) {

		if (IS_MF_SD(bp))

	/* Set the FCoE MAC in MF_SD mode */

	if (!CHIP_IS_E1x(bp) && IS_MF_SD(bp))

		memcpy(fip_mac, bp->dev->dev_addr, ETH_ALEN);

		else if (!IS_MF(bp))

			memcpy(fip_mac, iscsi_mac, ETH_ALEN);

	}



	/* Disable iSCSI if MAC configuration is

	 * invalid.