summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2009-12-02 15:15:37 +0000
committerDavid S. Miller <davem@davemloft.net>2009-12-02 19:57:20 -0800
commitdd2e4dbce32a2802088f6d0132046afec9bfb2ad (patch)
treee764df404792bb6e2e2315c8905e484519443fe2 /drivers
parent8b065b671d3096bfe0dbc9a833cb592f84642436 (diff)
downloadlinux-dd2e4dbce32a2802088f6d0132046afec9bfb2ad.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/cnic.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index fb1cadb0e1f5..bb6ce8ddcb29 100644
--- 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);