projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
b43legacy
/
xmit.c
diff --git
a/drivers/net/wireless/b43legacy/xmit.c
b/drivers/net/wireless/b43legacy/xmit.c
index
dcad249
..
fc83dab
100644
(file)
--- a/
drivers/net/wireless/b43legacy/xmit.c
+++ b/
drivers/net/wireless/b43legacy/xmit.c
@@
-232,7
+232,7
@@
static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
plcp_fragment_len = fragment_len + FCS_LEN;
if (use_encryption) {
- u8 key_idx =
(u16)(txctl->key_idx)
;
+ u8 key_idx =
txctl->hw_key->hw_key_idx
;
struct b43legacy_key *key;
int wlhdr_len;
size_t iv_len;