netxen: fix endianness read mac address

Amit Kumar Salecha · davem330 · commit a03d2451998e · 2010-01-15T01:37:24.000-08:00
In netxen_read_mac_addr, mac_addr should be declared
u64 instead of __le64, used by host only.

Signed-off-by: Amit Kumar Salecha &lt;amit.salecha@qlogic.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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)
 
 }
 
-int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac);
-int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac);
+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 *mac);
+int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, u64 *mac);
 extern void netxen_change_ringparam(struct netxen_adapter *adapter);
 extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,
 				int *valp);
diff --git 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,
 	return 0;
 }
 
-int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 *mac)
 {
 	__le32 *pmac = (__le32 *) mac;
 	u32 offset;
@@ -1058,7 +1058,7 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
 	return 0;
 }
 
-int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
+int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, u64 *mac)
 {
 	uint32_t crbaddr, mac_hi, mac_lo;
 	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
@@ -432,7 +432,7 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)
 {
 	int i;
 	unsigned char *p;
-	__le64 mac_addr;
+	u64 mac_addr;
 	struct net_device *netdev = adapter->netdev;
 	struct pci_dev *pdev = adapter->pdev;
 

Original file line number	Diff line number	Diff line change
`@@ -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);`
`1431`		`-int netxen_p3_get_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, u64 mac);`
`1432`	`1432`	`extern void netxen_change_ringparam(struct netxen_adapter *adapter);`
`1433`	`1433`	`extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,`
`1434`	`1434`	`int *valp);`
Original file line number	Diff line number	Diff line change
`@@ -1033,7 +1033,7 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,`
`1033`	`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`	`1038`	`__le32 pmac = (__le32 ) mac;`
`1039`	`1039`	`u32 offset;`
`@@ -1058,7 +1058,7 @@ int netxen_get_flash_mac_addr(struct netxen_adapter adapter, __le64 mac)`
`1058`	`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`	`1063`	`uint32_t crbaddr, mac_hi, mac_lo;`
`1064`	`1064`	`int pci_func = adapter->ahw.pci_func;`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)`
`432`	`432`	`{`
`433`	`433`	`int i;`
`434`	`434`	`unsigned char *p;`
`435`		`- __le64 mac_addr;`
	`435`	`+ u64 mac_addr;`
`436`	`436`	`struct net_device *netdev = adapter->netdev;`
`437`	`437`	`struct pci_dev *pdev = adapter->pdev;`
`438`	`438`