lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] rt2x00: Remove duplicate code in MAC & BSSID handling

Browse Source 
The various drivers contained duplicate code to handle the
MAC and BSSID initialization correctly. This moves the
address copy to little endian variables to rt2x00config.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ivo van Doorn
2007-10-06 14:11:46 +02:00
committed by David S. Miller
parent c109810318
commit 4abee4bbd7
7 changed files with 76 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/wireless/rt2x00/rt61pci.c
View File

@@ -274,42 +274,28 @@ static int rt61pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
/*
* Configuration handlers.
*/
static void rt61pci_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *addr)
static void rt61pci_config_mac_addr(struct rt2x00_dev *rt2x00dev, __le32 *mac)
{
__le32 reg[2];
u32 tmp;
memset(&reg, 0, sizeof(reg));
memcpy(&reg, addr, ETH_ALEN);
tmp = le32_to_cpu(reg[1]);
tmp = le32_to_cpu(mac[1]);
rt2x00_set_field32(&tmp, MAC_CSR3_UNICAST_TO_ME_MASK, 0xff);
reg[1] = cpu_to_le32(tmp);
mac[1] = cpu_to_le32(tmp);
/*
* The MAC address is passed to us as an array of bytes,
* that array is little endian, so no need for byte ordering.
*/
rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR2, &reg, sizeof(reg));
rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR2, mac,
(2 * sizeof(__le32)));
}
static void rt61pci_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid)
static void rt61pci_config_bssid(struct rt2x00_dev *rt2x00dev, __le32 *bssid)
{
__le32 reg[2];
u32 tmp;
memset(&reg, 0, sizeof(reg));
memcpy(&reg, bssid, ETH_ALEN);
tmp = le32_to_cpu(reg[1]);
tmp = le32_to_cpu(bssid[1]);
rt2x00_set_field32(&tmp, MAC_CSR5_BSS_ID_MASK, 3);
reg[1] = cpu_to_le32(tmp);
bssid[1] = cpu_to_le32(tmp);
/*
* The BSSID is passed to us as an array of bytes,
* that array is little endian, so no need for byte ordering.
*/
rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR4, &reg, sizeof(reg));
rt2x00pci_register_multiwrite(rt2x00dev, MAC_CSR4, bssid,
(2 * sizeof(__le32)));
}
static void rt61pci_config_type(struct rt2x00_dev *rt2x00dev, const int type)