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

30
drivers/net/wireless/rt2x00/rt2500usb.c
View File

@ -254,32 +254,18 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = {
/*
* Configuration handlers.
*/
static void rt2500usb_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *addr)
static void rt2500usb_config_mac_addr(struct rt2x00_dev *rt2x00dev,
__le32 *mac)
{
__le16 reg[3];
memset(&reg, 0, sizeof(reg));
memcpy(&reg, addr, ETH_ALEN);
/*
* The MAC address is passed to us as an array of bytes,
* that array is little endian, so no need for byte ordering.
*/
rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, &reg, sizeof(reg));
rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, &mac,
(3 * sizeof(__le16)));
}
static void rt2500usb_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid)
static void rt2500usb_config_bssid(struct rt2x00_dev *rt2x00dev,
__le32 *bssid)
{
__le16 reg[3];
memset(&reg, 0, sizeof(reg));
memcpy(&reg, bssid, ETH_ALEN);
/*
* The BSSID is passed to us as an array of bytes,
* that array is little endian, so no need for byte ordering.
*/
rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR5, &reg, sizeof(reg));
rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR5, bssid,
(3 * sizeof(__le16)));
}
static void rt2500usb_config_type(struct rt2x00_dev *rt2x00dev, const int type)