cnic: Fix bogus iSCSI MAC address

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

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index fb1cadb0e1f512c47ad87cb3f0c8c658db363f43..bb6ce8ddcb29660058d54ffde050c62a125bc431 100644 (file)
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -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);