Commit dd2e4dbc authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

cnic: Fix bogus iSCSI MAC address 



Fix code to read the proper iSCSI MAC address for bnx2x devices.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b065b67

drivers/net/cnic.c

+6 −2
Original line number Diff line number Diff line
@@ -3997,15 +3997,19 @@ static void cnic_get_bnx2x_iscsi_info(struct cnic_dev *dev) 
	if (base < 0xa0000 || base >= 0xc0000)

		return;



	val = BNX2X_SHMEM_ADDR(base,

	addr = BNX2X_SHMEM_ADDR(base,

		dev_info.port_hw_config[port].iscsi_mac_upper);



	val = CNIC_RD(dev, addr);



	dev->mac_addr[0] = (u8) (val >> 8);

	dev->mac_addr[1] = (u8) val;



	val = BNX2X_SHMEM_ADDR(base,

	addr = BNX2X_SHMEM_ADDR(base,

		dev_info.port_hw_config[port].iscsi_mac_lower);



	val = CNIC_RD(dev, addr);



	dev->mac_addr[2] = (u8) (val >> 24);

	dev->mac_addr[3] = (u8) (val >> 16);

	dev->mac_addr[4] = (u8) (val >> 8);