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

rt2800usb: use rt2x00usb_register_multiwrite() to set key entries

Browse Source 
Since struct hw_key_entry is 32-bytes large and is smaller than
CSR cache size (which is 64-bytes large) we can use the standard
rt2x00usb_register_multiwrite() helper to set key entries.

This cleanup is a part of preparations for later code unification.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-11-04 18:32:58 +01:00
committed by John W. Linville
parent 02a39c209b
commit 3306ef642a
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/rt2x00/rt2800usb.c
View File

@@ -392,7 +392,6 @@ static int rt2800usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
{ {
struct hw_key_entry key_entry; struct hw_key_entry key_entry;
struct rt2x00_field32 field; struct rt2x00_field32 field;
int timeout;
u32 offset; u32 offset;
u32 reg; u32 reg;
@@ -407,12 +406,8 @@ static int rt2800usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
sizeof(key_entry.rx_mic)); sizeof(key_entry.rx_mic));
offset = SHARED_KEY_ENTRY(key->hw_key_idx); offset = SHARED_KEY_ENTRY(key->hw_key_idx);
timeout = REGISTER_TIMEOUT32(sizeof(key_entry)); rt2x00usb_register_multiwrite(rt2x00dev, offset,
rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE, &key_entry, sizeof(key_entry));
USB_VENDOR_REQUEST_OUT,
offset, &key_entry,
sizeof(key_entry),
timeout);
} }
/* /*
@@ -445,7 +440,6 @@ static int rt2800usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
struct ieee80211_key_conf *key) struct ieee80211_key_conf *key)
{ {
struct hw_key_entry key_entry; struct hw_key_entry key_entry;
int timeout;
u32 offset; u32 offset;
if (crypto->cmd == SET_KEY) { if (crypto->cmd == SET_KEY) {
@@ -467,12 +461,8 @@ static int rt2800usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
sizeof(key_entry.rx_mic)); sizeof(key_entry.rx_mic));
offset = PAIRWISE_KEY_ENTRY(key->hw_key_idx); offset = PAIRWISE_KEY_ENTRY(key->hw_key_idx);
timeout = REGISTER_TIMEOUT32(sizeof(key_entry)); rt2x00usb_register_multiwrite(rt2x00dev, offset,
rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE, &key_entry, sizeof(key_entry));
USB_VENDOR_REQUEST_OUT,
offset, &key_entry,
sizeof(key_entry),
timeout);
} }
/* /*