diff options
author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-01-13 20:53:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-15 04:37:24 -0500 |
commit | a03d2451998e09e87eb573a9e04cc41fde2bb77f (patch) | |
tree | 21effa30f462f81749120fa05215432b52824303 /drivers/net/netxen | |
parent | 71fceff0ea36d5a6cffecb272b8b3970535fe905 (diff) |
netxen: fix endianness read mac address
In netxen_read_mac_addr, mac_addr should be declared
u64 instead of __le64, used by host only.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic.h | 4 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 4 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 8264ae0cbf1..1e9c8fa46c7 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
@@ -1427,8 +1427,8 @@ static inline u32 netxen_tx_avail(struct nx_host_tx_ring *tx_ring) | |||
1427 | 1427 | ||
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac); | 1430 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 *mac); |
1431 | int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac); | 1431 | int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, u64 *mac); |
1432 | extern void netxen_change_ringparam(struct netxen_adapter *adapter); | 1432 | extern void netxen_change_ringparam(struct netxen_adapter *adapter); |
1433 | extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, | 1433 | extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, |
1434 | int *valp); | 1434 | int *valp); |
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 85e28e60ecf..0db36f190ba 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -1033,7 +1033,7 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base, | |||
1033 | return 0; | 1033 | return 0; |
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac) | 1036 | int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 *mac) |
1037 | { | 1037 | { |
1038 | __le32 *pmac = (__le32 *) mac; | 1038 | __le32 *pmac = (__le32 *) mac; |
1039 | u32 offset; | 1039 | u32 offset; |
@@ -1058,7 +1058,7 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac) | |||
1058 | return 0; | 1058 | return 0; |
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac) | 1061 | int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, u64 *mac) |
1062 | { | 1062 | { |
1063 | uint32_t crbaddr, mac_hi, mac_lo; | 1063 | uint32_t crbaddr, mac_hi, mac_lo; |
1064 | int pci_func = adapter->ahw.pci_func; | 1064 | int pci_func = adapter->ahw.pci_func; |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index def4a07357d..b69cb3c7dfb 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -432,7 +432,7 @@ netxen_read_mac_addr(struct netxen_adapter *adapter) | |||
432 | { | 432 | { |
433 | int i; | 433 | int i; |
434 | unsigned char *p; | 434 | unsigned char *p; |
435 | __le64 mac_addr; | 435 | u64 mac_addr; |
436 | struct net_device *netdev = adapter->netdev; | 436 | struct net_device *netdev = adapter->netdev; |
437 | struct pci_dev *pdev = adapter->pdev; | 437 | struct pci_dev *pdev = adapter->pdev; |
438 | 438 | ||