diff options
Diffstat (limited to 'drivers/net/cnic.c')
-rw-r--r-- | drivers/net/cnic.c | 8 |
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) | |||
3997 | if (base < 0xa0000 || base >= 0xc0000) | 3997 | if (base < 0xa0000 || base >= 0xc0000) |
3998 | return; | 3998 | return; |
3999 | 3999 | ||
4000 | val = BNX2X_SHMEM_ADDR(base, | 4000 | addr = BNX2X_SHMEM_ADDR(base, |
4001 | dev_info.port_hw_config[port].iscsi_mac_upper); | 4001 | dev_info.port_hw_config[port].iscsi_mac_upper); |
4002 | 4002 | ||
4003 | val = CNIC_RD(dev, addr); | ||
4004 | |||
4003 | dev->mac_addr[0] = (u8) (val >> 8); | 4005 | dev->mac_addr[0] = (u8) (val >> 8); |
4004 | dev->mac_addr[1] = (u8) val; | 4006 | dev->mac_addr[1] = (u8) val; |
4005 | 4007 | ||
4006 | val = BNX2X_SHMEM_ADDR(base, | 4008 | addr = BNX2X_SHMEM_ADDR(base, |
4007 | dev_info.port_hw_config[port].iscsi_mac_lower); | 4009 | dev_info.port_hw_config[port].iscsi_mac_lower); |
4008 | 4010 | ||
4011 | val = CNIC_RD(dev, addr); | ||
4012 | |||
4009 | dev->mac_addr[2] = (u8) (val >> 24); | 4013 | dev->mac_addr[2] = (u8) (val >> 24); |
4010 | dev->mac_addr[3] = (u8) (val >> 16); | 4014 | dev->mac_addr[3] = (u8) (val >> 16); |
4011 | dev->mac_addr[4] = (u8) (val >> 8); | 4015 | dev->mac_addr[4] = (u8) (val >> 8); |