Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a03d2451 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

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: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71fceff0

drivers/net/netxen/netxen_nic.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/netxen/netxen_nic_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/netxen/netxen_nic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;