diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wireless/b43/xmit.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wireless/b43/xmit.h')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h index d4cf9b390af3..42debb5cd6fa 100644 --- a/drivers/net/wireless/b43/xmit.h +++ b/drivers/net/wireless/b43/xmit.h | |||
| @@ -73,6 +73,12 @@ struct b43_txhdr { | |||
| 73 | } __packed; | 73 | } __packed; |
| 74 | } __packed; | 74 | } __packed; |
| 75 | 75 | ||
| 76 | struct b43_tx_legacy_rate_phy_ctl_entry { | ||
| 77 | u8 bitrate; | ||
| 78 | u16 coding_rate; | ||
| 79 | u16 modulation; | ||
| 80 | }; | ||
| 81 | |||
| 76 | /* MAC TX control */ | 82 | /* MAC TX control */ |
| 77 | #define B43_TXH_MAC_USEFBR 0x10000000 /* Use fallback rate for this AMPDU */ | 83 | #define B43_TXH_MAC_USEFBR 0x10000000 /* Use fallback rate for this AMPDU */ |
| 78 | #define B43_TXH_MAC_KEYIDX 0x0FF00000 /* Security key index */ | 84 | #define B43_TXH_MAC_KEYIDX 0x0FF00000 /* Security key index */ |