diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 12:40:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 12:40:05 -0400 |
commit | 2ed0e21b30b53d3a94e204196e523e6c8f732b56 (patch) | |
tree | de2635426477d86338a9469ce09ba0626052288f /drivers/net/wireless/b43legacy/xmit.h | |
parent | 0fa213310cd8fa7a51071cdcf130e26fa56e9549 (diff) | |
parent | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
ipv4: Fix fib_trie rebalancing
Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
Bluetooth: Fix Kconfig issue with RFKILL integration
PIM-SM: namespace changes
ipv4: update ARPD help text
net: use a deferred timer in rt_check_expire
ieee802154: fix kconfig bool/tristate muckup
bonding: initialization rework
bonding: use is_zero_ether_addr
bonding: network device names are case sensative
bonding: elminate bad refcount code
bonding: fix style issues
bonding: fix destructor
bonding: remove bonding read/write semaphore
bonding: initialize before registration
bonding: bond_create always called with default parameters
x_tables: Convert printk to pr_err
netfilter: conntrack: optional reliable conntrack event delivery
list_nulls: add hlist_nulls_add_head and hlist_nulls_del
...
Diffstat (limited to 'drivers/net/wireless/b43legacy/xmit.h')
-rw-r--r-- | drivers/net/wireless/b43legacy/xmit.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/xmit.h b/drivers/net/wireless/b43legacy/xmit.h index 62e09d02788f..91633087a20b 100644 --- a/drivers/net/wireless/b43legacy/xmit.h +++ b/drivers/net/wireless/b43legacy/xmit.h | |||
@@ -67,7 +67,9 @@ struct b43legacy_txhdr_fw3 { | |||
67 | #define B43legacy_TX4_EFT_RTSFBOFDM 0x0010 /* RTS/CTS fallback rate type */ | 67 | #define B43legacy_TX4_EFT_RTSFBOFDM 0x0010 /* RTS/CTS fallback rate type */ |
68 | 68 | ||
69 | /* PHY TX control word */ | 69 | /* PHY TX control word */ |
70 | #define B43legacy_TX4_PHY_OFDM 0x0001 /* Data frame rate type */ | 70 | #define B43legacy_TX4_PHY_ENC 0x0003 /* Data frame encoding */ |
71 | #define B43legacy_TX4_PHY_ENC_CCK 0x0000 /* CCK */ | ||
72 | #define B43legacy_TX4_PHY_ENC_OFDM 0x0001 /* Data frame rate type */ | ||
71 | #define B43legacy_TX4_PHY_SHORTPRMBL 0x0010 /* Use short preamble */ | 73 | #define B43legacy_TX4_PHY_SHORTPRMBL 0x0010 /* Use short preamble */ |
72 | #define B43legacy_TX4_PHY_ANT 0x03C0 /* Antenna selection */ | 74 | #define B43legacy_TX4_PHY_ANT 0x03C0 /* Antenna selection */ |
73 | #define B43legacy_TX4_PHY_ANT0 0x0000 /* Use antenna 0 */ | 75 | #define B43legacy_TX4_PHY_ANT0 0x0000 /* Use antenna 0 */ |