mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
This commit is contained in:
John W. Linville
commit
38a0084063
198 changed files with 4692 additions and 15819 deletions
|
|
@ -137,6 +137,36 @@ struct bcma_host_ops {
|
|||
|
||||
#define BCMA_MAX_NR_CORES 16
|
||||
|
||||
/* Chip IDs of PCIe devices */
|
||||
#define BCMA_CHIP_ID_BCM4313 0x4313
|
||||
#define BCMA_CHIP_ID_BCM43224 43224
|
||||
#define BCMA_PKG_ID_BCM43224_FAB_CSM 0x8
|
||||
#define BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa
|
||||
#define BCMA_CHIP_ID_BCM43225 43225
|
||||
#define BCMA_CHIP_ID_BCM43227 43227
|
||||
#define BCMA_CHIP_ID_BCM43228 43228
|
||||
#define BCMA_CHIP_ID_BCM43421 43421
|
||||
#define BCMA_CHIP_ID_BCM43428 43428
|
||||
#define BCMA_CHIP_ID_BCM43431 43431
|
||||
#define BCMA_CHIP_ID_BCM43460 43460
|
||||
#define BCMA_CHIP_ID_BCM4331 0x4331
|
||||
#define BCMA_CHIP_ID_BCM6362 0x6362
|
||||
#define BCMA_CHIP_ID_BCM4360 0x4360
|
||||
#define BCMA_CHIP_ID_BCM4352 0x4352
|
||||
|
||||
/* Chip IDs of SoCs */
|
||||
#define BCMA_CHIP_ID_BCM4706 0x5300
|
||||
#define BCMA_CHIP_ID_BCM4716 0x4716
|
||||
#define BCMA_PKG_ID_BCM4716 8
|
||||
#define BCMA_PKG_ID_BCM4717 9
|
||||
#define BCMA_PKG_ID_BCM4718 10
|
||||
#define BCMA_CHIP_ID_BCM47162 47162
|
||||
#define BCMA_CHIP_ID_BCM4748 0x4748
|
||||
#define BCMA_CHIP_ID_BCM4749 0x4749
|
||||
#define BCMA_CHIP_ID_BCM5356 0x5356
|
||||
#define BCMA_CHIP_ID_BCM5357 0x5357
|
||||
#define BCMA_CHIP_ID_BCM53572 53572
|
||||
|
||||
struct bcma_device {
|
||||
struct bcma_bus *bus;
|
||||
struct bcma_device_id id;
|
||||
|
|
|
|||
|
|
@ -88,6 +88,11 @@
|
|||
#define BCMA_CC_CHIPST_4313_OTP_PRESENT 2
|
||||
#define BCMA_CC_CHIPST_4331_SPROM_PRESENT 2
|
||||
#define BCMA_CC_CHIPST_4331_OTP_PRESENT 4
|
||||
#define BCMA_CC_CHIPST_4706_PKG_OPTION BIT(0) /* 0: full-featured package 1: low-cost package */
|
||||
#define BCMA_CC_CHIPST_4706_SFLASH_PRESENT BIT(1) /* 0: parallel, 1: serial flash is present */
|
||||
#define BCMA_CC_CHIPST_4706_SFLASH_TYPE BIT(2) /* 0: 8b-p/ST-s flash, 1: 16b-p/Atmal-s flash */
|
||||
#define BCMA_CC_CHIPST_4706_MIPS_BENDIAN BIT(3) /* 0: little, 1: big endian */
|
||||
#define BCMA_CC_CHIPST_4706_PCIE1_DISABLE BIT(5) /* PCIE1 enable strap pin */
|
||||
#define BCMA_CC_JCMD 0x0030 /* Rev >= 10 only */
|
||||
#define BCMA_CC_JCMD_START 0x80000000
|
||||
#define BCMA_CC_JCMD_BUSY 0x80000000
|
||||
|
|
@ -280,6 +285,15 @@
|
|||
|
||||
/* 4706 PMU */
|
||||
#define BCMA_CC_PMU4706_MAINPLL_PLL0 0
|
||||
#define BCMA_CC_PMU6_4706_PROCPLL_OFF 4 /* The CPU PLL */
|
||||
#define BCMA_CC_PMU6_4706_PROC_P2DIV_MASK 0x000f0000
|
||||
#define BCMA_CC_PMU6_4706_PROC_P2DIV_SHIFT 16
|
||||
#define BCMA_CC_PMU6_4706_PROC_P1DIV_MASK 0x0000f000
|
||||
#define BCMA_CC_PMU6_4706_PROC_P1DIV_SHIFT 12
|
||||
#define BCMA_CC_PMU6_4706_PROC_NDIV_INT_MASK 0x00000ff8
|
||||
#define BCMA_CC_PMU6_4706_PROC_NDIV_INT_SHIFT 3
|
||||
#define BCMA_CC_PMU6_4706_PROC_NDIV_MODE_MASK 0x00000007
|
||||
#define BCMA_CC_PMU6_4706_PROC_NDIV_MODE_SHIFT 0
|
||||
|
||||
/* ALP clock on pre-PMU chips */
|
||||
#define BCMA_CC_PMU_ALP_CLOCK 20000000
|
||||
|
|
@ -308,6 +322,19 @@
|
|||
#define BCMA_CC_PPL_PCHI_OFF 5
|
||||
#define BCMA_CC_PPL_PCHI_MASK 0x0000003f
|
||||
|
||||
#define BCMA_CC_PMU_PLL_CTL0 0
|
||||
#define BCMA_CC_PMU_PLL_CTL1 1
|
||||
#define BCMA_CC_PMU_PLL_CTL2 2
|
||||
#define BCMA_CC_PMU_PLL_CTL3 3
|
||||
#define BCMA_CC_PMU_PLL_CTL4 4
|
||||
#define BCMA_CC_PMU_PLL_CTL5 5
|
||||
|
||||
#define BCMA_CC_PMU1_PLL0_PC0_P1DIV_MASK 0x00f00000
|
||||
#define BCMA_CC_PMU1_PLL0_PC0_P1DIV_SHIFT 20
|
||||
|
||||
#define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_MASK 0x1ff00000
|
||||
#define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT 20
|
||||
|
||||
/* BCM4331 ChipControl numbers. */
|
||||
#define BCMA_CHIPCTL_4331_BT_COEXIST BIT(0) /* 0 disable */
|
||||
#define BCMA_CHIPCTL_4331_SECI BIT(1) /* 0 SECI is disabled (JATG functional) */
|
||||
|
|
@ -321,9 +348,18 @@
|
|||
#define BCMA_CHIPCTL_4331_OVR_PIPEAUXPWRDOWN BIT(9) /* override core control on pipe_AuxPowerDown */
|
||||
#define BCMA_CHIPCTL_4331_PCIE_AUXCLKEN BIT(10) /* pcie_auxclkenable */
|
||||
#define BCMA_CHIPCTL_4331_PCIE_PIPE_PLLDOWN BIT(11) /* pcie_pipe_pllpowerdown */
|
||||
#define BCMA_CHIPCTL_4331_EXTPA_EN2 BIT(12) /* 0 ext pa disable, 1 ext pa enabled */
|
||||
#define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4 BIT(16) /* enable bt_shd0 at gpio4 */
|
||||
#define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5 BIT(17) /* enable bt_shd1 at gpio5 */
|
||||
|
||||
/* 43224 chip-specific ChipControl register bits */
|
||||
#define BCMA_CCTRL_43224_GPIO_TOGGLE 0x8000 /* gpio[3:0] pins as btcoex or s/w gpio */
|
||||
#define BCMA_CCTRL_43224A0_12MA_LED_DRIVE 0x00F000F0 /* 12 mA drive strength */
|
||||
#define BCMA_CCTRL_43224B0_12MA_LED_DRIVE 0xF0 /* 12 mA drive strength for later 43224s */
|
||||
|
||||
/* 4313 Chip specific ChipControl register bits */
|
||||
#define BCMA_CCTRL_4313_12MA_LED_DRIVE 0x00000007 /* 12 mA drive strengh for later 4313 */
|
||||
|
||||
/* Data for the PMU, if available.
|
||||
* Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
|
||||
*/
|
||||
|
|
@ -411,5 +447,6 @@ extern void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,
|
|||
u32 offset, u32 mask, u32 set);
|
||||
extern void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc,
|
||||
u32 offset, u32 mask, u32 set);
|
||||
extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid);
|
||||
|
||||
#endif /* LINUX_BCMA_DRIVER_CC_H_ */
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
#define IEEE80211_FCTL_MOREDATA 0x2000
|
||||
#define IEEE80211_FCTL_PROTECTED 0x4000
|
||||
#define IEEE80211_FCTL_ORDER 0x8000
|
||||
#define IEEE80211_FCTL_CTL_EXT 0x0f00
|
||||
|
||||
#define IEEE80211_SCTL_FRAG 0x000F
|
||||
#define IEEE80211_SCTL_SEQ 0xFFF0
|
||||
|
|
@ -54,6 +55,7 @@
|
|||
#define IEEE80211_FTYPE_MGMT 0x0000
|
||||
#define IEEE80211_FTYPE_CTL 0x0004
|
||||
#define IEEE80211_FTYPE_DATA 0x0008
|
||||
#define IEEE80211_FTYPE_EXT 0x000c
|
||||
|
||||
/* management */
|
||||
#define IEEE80211_STYPE_ASSOC_REQ 0x0000
|
||||
|
|
@ -70,6 +72,7 @@
|
|||
#define IEEE80211_STYPE_ACTION 0x00D0
|
||||
|
||||
/* control */
|
||||
#define IEEE80211_STYPE_CTL_EXT 0x0060
|
||||
#define IEEE80211_STYPE_BACK_REQ 0x0080
|
||||
#define IEEE80211_STYPE_BACK 0x0090
|
||||
#define IEEE80211_STYPE_PSPOLL 0x00A0
|
||||
|
|
@ -97,6 +100,18 @@
|
|||
#define IEEE80211_STYPE_QOS_CFPOLL 0x00E0
|
||||
#define IEEE80211_STYPE_QOS_CFACKPOLL 0x00F0
|
||||
|
||||
/* extension, added by 802.11ad */
|
||||
#define IEEE80211_STYPE_DMG_BEACON 0x0000
|
||||
|
||||
/* control extension - for IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTL_EXT */
|
||||
#define IEEE80211_CTL_EXT_POLL 0x2000
|
||||
#define IEEE80211_CTL_EXT_SPR 0x3000
|
||||
#define IEEE80211_CTL_EXT_GRANT 0x4000
|
||||
#define IEEE80211_CTL_EXT_DMG_CTS 0x5000
|
||||
#define IEEE80211_CTL_EXT_DMG_DTS 0x6000
|
||||
#define IEEE80211_CTL_EXT_SSW 0x8000
|
||||
#define IEEE80211_CTL_EXT_SSW_FBACK 0x9000
|
||||
#define IEEE80211_CTL_EXT_SSW_ACK 0xa000
|
||||
|
||||
/* miscellaneous IEEE 802.11 constants */
|
||||
#define IEEE80211_MAX_FRAG_THRESHOLD 2352
|
||||
|
|
@ -1092,6 +1107,73 @@ struct ieee80211_ht_operation {
|
|||
#define WLAN_HT_SMPS_CONTROL_STATIC 1
|
||||
#define WLAN_HT_SMPS_CONTROL_DYNAMIC 3
|
||||
|
||||
#define VHT_MCS_SUPPORTED_SET_SIZE 8
|
||||
|
||||
struct ieee80211_vht_capabilities {
|
||||
__le32 vht_capabilities_info;
|
||||
u8 vht_supported_mcs_set[VHT_MCS_SUPPORTED_SET_SIZE];
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_vht_operation {
|
||||
u8 vht_op_info_chwidth;
|
||||
u8 vht_op_info_chan_center_freq_seg1_idx;
|
||||
u8 vht_op_info_chan_center_freq_seg2_idx;
|
||||
__le16 vht_basic_mcs_set;
|
||||
} __packed;
|
||||
|
||||
/**
|
||||
* struct ieee80211_vht_mcs_info - VHT MCS information
|
||||
* @rx_mcs_map: RX MCS map 2 bits for each stream, total 8 streams
|
||||
* @rx_highest: Indicates highest long GI VHT PPDU data rate
|
||||
* STA can receive. Rate expressed in units of 1 Mbps.
|
||||
* If this field is 0 this value should not be used to
|
||||
* consider the highest RX data rate supported.
|
||||
* @tx_mcs_map: TX MCS map 2 bits for each stream, total 8 streams
|
||||
* @tx_highest: Indicates highest long GI VHT PPDU data rate
|
||||
* STA can transmit. Rate expressed in units of 1 Mbps.
|
||||
* If this field is 0 this value should not be used to
|
||||
* consider the highest TX data rate supported.
|
||||
*/
|
||||
struct ieee80211_vht_mcs_info {
|
||||
__le16 rx_mcs_map;
|
||||
__le16 rx_highest;
|
||||
__le16 tx_mcs_map;
|
||||
__le16 tx_highest;
|
||||
} __packed;
|
||||
|
||||
#define IEEE80211_VHT_MCS_ZERO_TO_SEVEN_SUPPORT 0
|
||||
#define IEEE80211_VHT_MCS_ZERO_TO_EIGHT_SUPPORT 1
|
||||
#define IEEE80211_VHT_MCS_ZERO_TO_NINE_SUPPORT 2
|
||||
#define IEEE80211_VHT_MCS_NOT_SUPPORTED 3
|
||||
|
||||
/* 802.11ac VHT Capabilities */
|
||||
#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 0x00000000
|
||||
#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 0x00000001
|
||||
#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 0x00000002
|
||||
#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ 0x00000004
|
||||
#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ 0x00000008
|
||||
#define IEEE80211_VHT_CAP_RXLDPC 0x00000010
|
||||
#define IEEE80211_VHT_CAP_SHORT_GI_80 0x00000020
|
||||
#define IEEE80211_VHT_CAP_SHORT_GI_160 0x00000040
|
||||
#define IEEE80211_VHT_CAP_TXSTBC 0x00000080
|
||||
#define IEEE80211_VHT_CAP_RXSTBC_1 0x00000100
|
||||
#define IEEE80211_VHT_CAP_RXSTBC_2 0x00000200
|
||||
#define IEEE80211_VHT_CAP_RXSTBC_3 0x00000300
|
||||
#define IEEE80211_VHT_CAP_RXSTBC_4 0x00000400
|
||||
#define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE 0x00000800
|
||||
#define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE 0x00001000
|
||||
#define IEEE80211_VHT_CAP_BEAMFORMER_ANTENNAS_MAX 0x00006000
|
||||
#define IEEE80211_VHT_CAP_SOUNDING_DIMENTION_MAX 0x00030000
|
||||
#define IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE 0x00080000
|
||||
#define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE 0x00100000
|
||||
#define IEEE80211_VHT_CAP_VHT_TXOP_PS 0x00200000
|
||||
#define IEEE80211_VHT_CAP_HTC_VHT 0x00400000
|
||||
#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT 0x00800000
|
||||
#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB 0x08000000
|
||||
#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB 0x0c000000
|
||||
#define IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN 0x10000000
|
||||
#define IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN 0x20000000
|
||||
|
||||
/* Authentication algorithms */
|
||||
#define WLAN_AUTH_OPEN 0
|
||||
#define WLAN_AUTH_SHARED_KEY 1
|
||||
|
|
@ -1124,6 +1206,21 @@ struct ieee80211_ht_operation {
|
|||
#define WLAN_CAPABILITY_QOS (1<<9)
|
||||
#define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
|
||||
#define WLAN_CAPABILITY_DSSS_OFDM (1<<13)
|
||||
|
||||
/* DMG (60gHz) 802.11ad */
|
||||
/* type - bits 0..1 */
|
||||
#define WLAN_CAPABILITY_DMG_TYPE_IBSS (1<<0) /* Tx by: STA */
|
||||
#define WLAN_CAPABILITY_DMG_TYPE_PBSS (2<<0) /* Tx by: PCP */
|
||||
#define WLAN_CAPABILITY_DMG_TYPE_AP (3<<0) /* Tx by: AP */
|
||||
|
||||
#define WLAN_CAPABILITY_DMG_CBAP_ONLY (1<<2)
|
||||
#define WLAN_CAPABILITY_DMG_CBAP_SOURCE (1<<3)
|
||||
#define WLAN_CAPABILITY_DMG_PRIVACY (1<<4)
|
||||
#define WLAN_CAPABILITY_DMG_ECPAC (1<<5)
|
||||
|
||||
#define WLAN_CAPABILITY_DMG_SPECTRUM_MGMT (1<<8)
|
||||
#define WLAN_CAPABILITY_DMG_RADIO_MEASURE (1<<12)
|
||||
|
||||
/* measurement */
|
||||
#define IEEE80211_SPCT_MSR_RPRT_MODE_LATE (1<<0)
|
||||
#define IEEE80211_SPCT_MSR_RPRT_MODE_INCAPABLE (1<<1)
|
||||
|
|
@ -1133,7 +1230,6 @@ struct ieee80211_ht_operation {
|
|||
#define IEEE80211_SPCT_MSR_RPRT_TYPE_CCA 1
|
||||
#define IEEE80211_SPCT_MSR_RPRT_TYPE_RPI 2
|
||||
|
||||
|
||||
/* 802.11g ERP information element */
|
||||
#define WLAN_ERP_NON_ERP_PRESENT (1<<0)
|
||||
#define WLAN_ERP_USE_PROTECTION (1<<1)
|
||||
|
|
@ -1145,6 +1241,16 @@ enum {
|
|||
WLAN_ERP_PREAMBLE_LONG = 1,
|
||||
};
|
||||
|
||||
/* Band ID, 802.11ad #8.4.1.45 */
|
||||
enum {
|
||||
IEEE80211_BANDID_TV_WS = 0, /* TV white spaces */
|
||||
IEEE80211_BANDID_SUB1 = 1, /* Sub-1 GHz (excluding TV white spaces) */
|
||||
IEEE80211_BANDID_2G = 2, /* 2.4 GHz */
|
||||
IEEE80211_BANDID_3G = 3, /* 3.6 GHz */
|
||||
IEEE80211_BANDID_5G = 4, /* 4.9 and 5 GHz */
|
||||
IEEE80211_BANDID_60G = 5, /* 60 GHz */
|
||||
};
|
||||
|
||||
/* Status codes */
|
||||
enum ieee80211_statuscode {
|
||||
WLAN_STATUS_SUCCESS = 0,
|
||||
|
|
@ -1196,6 +1302,17 @@ enum ieee80211_statuscode {
|
|||
WLAN_STATUS_ANTI_CLOG_REQUIRED = 76,
|
||||
WLAN_STATUS_FCG_NOT_SUPP = 78,
|
||||
WLAN_STATUS_STA_NO_TBTT = 78,
|
||||
/* 802.11ad */
|
||||
WLAN_STATUS_REJECTED_WITH_SUGGESTED_CHANGES = 39,
|
||||
WLAN_STATUS_REJECTED_FOR_DELAY_PERIOD = 47,
|
||||
WLAN_STATUS_REJECT_WITH_SCHEDULE = 83,
|
||||
WLAN_STATUS_PENDING_ADMITTING_FST_SESSION = 86,
|
||||
WLAN_STATUS_PERFORMING_FST_NOW = 87,
|
||||
WLAN_STATUS_PENDING_GAP_IN_BA_WINDOW = 88,
|
||||
WLAN_STATUS_REJECT_U_PID_SETTING = 89,
|
||||
WLAN_STATUS_REJECT_DSE_BAND = 96,
|
||||
WLAN_STATUS_DENIED_WITH_SUGGESTED_BAND_AND_CHANNEL = 99,
|
||||
WLAN_STATUS_DENIED_DUE_TO_SPECTRUM_MANAGEMENT = 103,
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -1352,6 +1469,43 @@ enum ieee80211_eid {
|
|||
WLAN_EID_DSE_REGISTERED_LOCATION = 58,
|
||||
WLAN_EID_SUPPORTED_REGULATORY_CLASSES = 59,
|
||||
WLAN_EID_EXT_CHANSWITCH_ANN = 60,
|
||||
|
||||
WLAN_EID_VHT_CAPABILITY = 191,
|
||||
WLAN_EID_VHT_OPERATION = 192,
|
||||
|
||||
/* 802.11ad */
|
||||
WLAN_EID_NON_TX_BSSID_CAP = 83,
|
||||
WLAN_EID_WAKEUP_SCHEDULE = 143,
|
||||
WLAN_EID_EXT_SCHEDULE = 144,
|
||||
WLAN_EID_STA_AVAILABILITY = 145,
|
||||
WLAN_EID_DMG_TSPEC = 146,
|
||||
WLAN_EID_DMG_AT = 147,
|
||||
WLAN_EID_DMG_CAP = 148,
|
||||
WLAN_EID_DMG_OPERATION = 151,
|
||||
WLAN_EID_DMG_BSS_PARAM_CHANGE = 152,
|
||||
WLAN_EID_DMG_BEAM_REFINEMENT = 153,
|
||||
WLAN_EID_CHANNEL_MEASURE_FEEDBACK = 154,
|
||||
WLAN_EID_AWAKE_WINDOW = 157,
|
||||
WLAN_EID_MULTI_BAND = 158,
|
||||
WLAN_EID_ADDBA_EXT = 159,
|
||||
WLAN_EID_NEXT_PCP_LIST = 160,
|
||||
WLAN_EID_PCP_HANDOVER = 161,
|
||||
WLAN_EID_DMG_LINK_MARGIN = 162,
|
||||
WLAN_EID_SWITCHING_STREAM = 163,
|
||||
WLAN_EID_SESSION_TRANSITION = 164,
|
||||
WLAN_EID_DYN_TONE_PAIRING_REPORT = 165,
|
||||
WLAN_EID_CLUSTER_REPORT = 166,
|
||||
WLAN_EID_RELAY_CAP = 167,
|
||||
WLAN_EID_RELAY_XFER_PARAM_SET = 168,
|
||||
WLAN_EID_BEAM_LINK_MAINT = 169,
|
||||
WLAN_EID_MULTIPLE_MAC_ADDR = 170,
|
||||
WLAN_EID_U_PID = 171,
|
||||
WLAN_EID_DMG_LINK_ADAPT_ACK = 172,
|
||||
WLAN_EID_QUIET_PERIOD_REQ = 175,
|
||||
WLAN_EID_QUIET_PERIOD_RESP = 177,
|
||||
WLAN_EID_EPAC_POLICY = 182,
|
||||
WLAN_EID_CLISTER_TIME_OFF = 183,
|
||||
WLAN_EID_ANTENNA_SECTOR_ID_PATTERN = 190,
|
||||
};
|
||||
|
||||
/* Action category code */
|
||||
|
|
@ -1368,7 +1522,10 @@ enum ieee80211_category {
|
|||
WLAN_CATEGORY_MESH_ACTION = 13,
|
||||
WLAN_CATEGORY_MULTIHOP_ACTION = 14,
|
||||
WLAN_CATEGORY_SELF_PROTECTED = 15,
|
||||
WLAN_CATEGORY_DMG = 16,
|
||||
WLAN_CATEGORY_WMM = 17,
|
||||
WLAN_CATEGORY_FST = 18,
|
||||
WLAN_CATEGORY_UNPROT_DMG = 20,
|
||||
WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126,
|
||||
WLAN_CATEGORY_VENDOR_SPECIFIC = 127,
|
||||
};
|
||||
|
|
@ -1616,6 +1773,7 @@ enum ieee80211_sa_query_action {
|
|||
#define WLAN_CIPHER_SUITE_CCMP 0x000FAC04
|
||||
#define WLAN_CIPHER_SUITE_WEP104 0x000FAC05
|
||||
#define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06
|
||||
#define WLAN_CIPHER_SUITE_GCMP 0x000FAC08
|
||||
|
||||
#define WLAN_CIPHER_SUITE_SMS4 0x00147201
|
||||
|
||||
|
|
|
|||
|
|
@ -136,8 +136,9 @@ enum nfc_attrs {
|
|||
#define NFC_PROTO_FELICA 3
|
||||
#define NFC_PROTO_ISO14443 4
|
||||
#define NFC_PROTO_NFC_DEP 5
|
||||
#define NFC_PROTO_ISO14443_B 6
|
||||
|
||||
#define NFC_PROTO_MAX 6
|
||||
#define NFC_PROTO_MAX 7
|
||||
|
||||
/* NFC communication modes */
|
||||
#define NFC_COMM_ACTIVE 0
|
||||
|
|
@ -149,11 +150,12 @@ enum nfc_attrs {
|
|||
#define NFC_RF_NONE 2
|
||||
|
||||
/* NFC protocols masks used in bitsets */
|
||||
#define NFC_PROTO_JEWEL_MASK (1 << NFC_PROTO_JEWEL)
|
||||
#define NFC_PROTO_MIFARE_MASK (1 << NFC_PROTO_MIFARE)
|
||||
#define NFC_PROTO_FELICA_MASK (1 << NFC_PROTO_FELICA)
|
||||
#define NFC_PROTO_ISO14443_MASK (1 << NFC_PROTO_ISO14443)
|
||||
#define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP)
|
||||
#define NFC_PROTO_JEWEL_MASK (1 << NFC_PROTO_JEWEL)
|
||||
#define NFC_PROTO_MIFARE_MASK (1 << NFC_PROTO_MIFARE)
|
||||
#define NFC_PROTO_FELICA_MASK (1 << NFC_PROTO_FELICA)
|
||||
#define NFC_PROTO_ISO14443_MASK (1 << NFC_PROTO_ISO14443)
|
||||
#define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP)
|
||||
#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
|
||||
|
||||
struct sockaddr_nfc {
|
||||
sa_family_t sa_family;
|
||||
|
|
|
|||
|
|
@ -1638,12 +1638,20 @@ struct nl80211_sta_flag_update {
|
|||
*
|
||||
* These attribute types are used with %NL80211_STA_INFO_TXRATE
|
||||
* when getting information about the bitrate of a station.
|
||||
* There are 2 attributes for bitrate, a legacy one that represents
|
||||
* a 16-bit value, and new one that represents a 32-bit value.
|
||||
* If the rate value fits into 16 bit, both attributes are reported
|
||||
* with the same value. If the rate is too high to fit into 16 bits
|
||||
* (>6.5535Gbps) only 32-bit attribute is included.
|
||||
* User space tools encouraged to use the 32-bit attribute and fall
|
||||
* back to the 16-bit one for compatibility with older kernels.
|
||||
*
|
||||
* @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved
|
||||
* @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s)
|
||||
* @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8)
|
||||
* @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 Mhz dualchannel bitrate
|
||||
* @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval
|
||||
* @NL80211_RATE_INFO_BITRATE32: total bitrate (u32, 100kbit/s)
|
||||
* @NL80211_RATE_INFO_MAX: highest rate_info number currently defined
|
||||
* @__NL80211_RATE_INFO_AFTER_LAST: internal use
|
||||
*/
|
||||
|
|
@ -1653,6 +1661,7 @@ enum nl80211_rate_info {
|
|||
NL80211_RATE_INFO_MCS,
|
||||
NL80211_RATE_INFO_40_MHZ_WIDTH,
|
||||
NL80211_RATE_INFO_SHORT_GI,
|
||||
NL80211_RATE_INFO_BITRATE32,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_RATE_INFO_AFTER_LAST,
|
||||
|
|
@ -1813,6 +1822,9 @@ enum nl80211_mpath_info {
|
|||
* @NL80211_BAND_ATTR_HT_CAPA: HT capabilities, as in the HT information IE
|
||||
* @NL80211_BAND_ATTR_HT_AMPDU_FACTOR: A-MPDU factor, as in 11n
|
||||
* @NL80211_BAND_ATTR_HT_AMPDU_DENSITY: A-MPDU density, as in 11n
|
||||
* @NL80211_BAND_ATTR_VHT_MCS_SET: 32-byte attribute containing the MCS set as
|
||||
* defined in 802.11ac
|
||||
* @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE
|
||||
* @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
|
||||
* @__NL80211_BAND_ATTR_AFTER_LAST: internal use
|
||||
*/
|
||||
|
|
@ -1826,6 +1838,9 @@ enum nl80211_band_attr {
|
|||
NL80211_BAND_ATTR_HT_AMPDU_FACTOR,
|
||||
NL80211_BAND_ATTR_HT_AMPDU_DENSITY,
|
||||
|
||||
NL80211_BAND_ATTR_VHT_MCS_SET,
|
||||
NL80211_BAND_ATTR_VHT_CAPA,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_BAND_ATTR_AFTER_LAST,
|
||||
NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST - 1
|
||||
|
|
@ -2539,10 +2554,12 @@ enum nl80211_tx_rate_attributes {
|
|||
* enum nl80211_band - Frequency band
|
||||
* @NL80211_BAND_2GHZ: 2.4 GHz ISM band
|
||||
* @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
|
||||
* @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)
|
||||
*/
|
||||
enum nl80211_band {
|
||||
NL80211_BAND_2GHZ,
|
||||
NL80211_BAND_5GHZ,
|
||||
NL80211_BAND_60GHZ,
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue