Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
This commit is contained in:
@@ -1436,6 +1436,10 @@ struct mac_iveiv_entry {
|
||||
#define MAC_WCID_ATTRIBUTE_CIPHER FIELD32(0x0000000e)
|
||||
#define MAC_WCID_ATTRIBUTE_BSS_IDX FIELD32(0x00000070)
|
||||
#define MAC_WCID_ATTRIBUTE_RX_WIUDF FIELD32(0x00000380)
|
||||
#define MAC_WCID_ATTRIBUTE_CIPHER_EXT FIELD32(0x00000400)
|
||||
#define MAC_WCID_ATTRIBUTE_BSS_IDX_EXT FIELD32(0x00000800)
|
||||
#define MAC_WCID_ATTRIBUTE_WAPI_MCBC FIELD32(0x00008000)
|
||||
#define MAC_WCID_ATTRIBUTE_WAPI_KEY_IDX FIELD32(0xff000000)
|
||||
|
||||
/*
|
||||
* SHARED_KEY_MODE:
|
||||
@@ -1557,7 +1561,9 @@ struct mac_iveiv_entry {
|
||||
*/
|
||||
|
||||
/*
|
||||
* BBP 1: TX Antenna
|
||||
* BBP 1: TX Antenna & Power
|
||||
* POWER: 0 - normal, 1 - drop tx power by 6dBm, 2 - drop tx power by 12dBm,
|
||||
* 3 - increase tx power by 6dBm
|
||||
*/
|
||||
#define BBP1_TX_POWER FIELD8(0x07)
|
||||
#define BBP1_TX_ANTENNA FIELD8(0x18)
|
||||
|
Reference in New Issue
Block a user