diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-19 06:15:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-19 06:15:44 +0200 |
| commit | 8e0f36ec371ef4804da46d962d5272b3efb04481 (patch) | |
| tree | 7207bb6ffa31c1fe6bf7cddb33561a4ebebd5cc4 /drivers/net/wireless/p54/p54common.h | |
| parent | dccp: Fix panic caused by too early termination of retransmission mechanism (diff) | |
| parent | removed unused #include <version.h> (diff) | |
| download | linux-8e0f36ec371ef4804da46d962d5272b3efb04481.tar.xz linux-8e0f36ec371ef4804da46d962d5272b3efb04481.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/p54/p54common.h')
| -rw-r--r-- | drivers/net/wireless/p54/p54common.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h index 2245fcce92dc..8db6c0e8e540 100644 --- a/drivers/net/wireless/p54/p54common.h +++ b/drivers/net/wireless/p54/p54common.h @@ -183,16 +183,16 @@ struct p54_frame_sent_hdr { struct p54_tx_control_allocdata { u8 rateset[8]; - u16 padding; - u8 wep_key_present; - u8 wep_key_len; - u8 wep_key[16]; - __le32 frame_type; - u32 padding2; - __le16 magic4; - u8 antenna; + u8 unalloc0[2]; + u8 key_type; + u8 key_len; + u8 key[16]; + u8 hw_queue; + u8 unalloc1[9]; + u8 tx_antenna; u8 output_power; - __le32 magic5; + u8 cts_rate; + u8 unalloc2[3]; u8 align[0]; } __attribute__ ((packed)); |