Showing the changes to include/uapi/linux (2 of 244 files). Show all
Unified · Split
| @@ -273,11 +273,19 @@ struct sockaddr_nfc_llcp { · 272 unmodified lines | |||
| 273 | * First byte is the adapter index | 273 | * First byte is the adapter index |
| 274 | * Second byte contains flags | 274 | * Second byte contains flags |
| 275 | * - 0x01 - Direction (0=RX, 1=TX) | 275 | * - 0x01 - Direction (0=RX, 1=TX) |
| 276 | * - 0x02-0x80 - Reserved | 276 | * - 0x02-0x04 - Payload type (000=LLCP, 001=NCI, 010=HCI, 011=Digital, |
| 277 | * 100=Proprietary) | ||
| 278 | * - 0x05-0x80 - Reserved | ||
| 277 | **/ | 279 | **/ |
| 278 | #define NFC_LLCP_RAW_HEADER_SIZE 2 | 280 | #define NFC_RAW_HEADER_SIZE 2 |
| 279 | #define NFC_LLCP_DIRECTION_RX 0x00 | 281 | #define NFC_DIRECTION_RX 0x00 |
| 280 | #define NFC_LLCP_DIRECTION_TX 0x01 | 282 | #define NFC_DIRECTION_TX 0x01 |
| 283 | |||
| 284 | #define RAW_PAYLOAD_LLCP 0 | ||
| 285 | #define RAW_PAYLOAD_NCI 1 | ||
| 286 | #define RAW_PAYLOAD_HCI 2 | ||
| 287 | #define RAW_PAYLOAD_DIGITAL 3 | ||
| 288 | #define RAW_PAYLOAD_PROPRIETARY 4 | ||
| 281 | 289 | ||
| 282 | /* socket option names */ | 290 | /* socket option names */ |
| 283 | #define NFC_LLCP_RW 0 | 291 | #define NFC_LLCP_RW 0 |
| @@ -503,6 +503,9 @@ · 502 unmodified lines | |||
| 503 | * TX status event pertaining to the TX request. | 503 | * TX status event pertaining to the TX request. |
| 504 | * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the | 504 | * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the |
| 505 | * management frames at CCK rate or not in 2GHz band. | 505 | * management frames at CCK rate or not in 2GHz band. |
| 506 | * %NL80211_ATTR_CSA_C_OFFSETS_TX is an array of offsets to CSA | ||
| 507 | * counters which will be updated to the current value. This attribute | ||
| 508 | * is used during CSA period. | ||
| 506 | * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this | 509 | * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this |
| 507 | * command may be used with the corresponding cookie to cancel the wait | 510 | * command may be used with the corresponding cookie to cancel the wait |
| 508 | * time if it is known that it is no longer necessary. | 511 | * time if it is known that it is no longer necessary. |
| @@ -1525,10 +1528,10 @@ enum nl80211_commands { · 1016 unmodified lines | |||
| 1525 | * operation). | 1528 | * operation). |
| 1526 | * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information | 1529 | * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information |
| 1527 | * for the time while performing a channel switch. | 1530 | * for the time while performing a channel switch. |
| 1528 | * @NL80211_ATTR_CSA_C_OFF_BEACON: Offset of the channel switch counter | 1531 | * @NL80211_ATTR_CSA_C_OFF_BEACON: An array of offsets (u16) to the channel |
| 1529 | * field in the beacons tail (%NL80211_ATTR_BEACON_TAIL). | 1532 | * switch counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL). |
| 1530 | * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter | 1533 | * @NL80211_ATTR_CSA_C_OFF_PRESP: An array of offsets (u16) to the channel |
| 1531 | * field in the probe response (%NL80211_ATTR_PROBE_RESP). | 1534 | * switch counters in the probe response (%NL80211_ATTR_PROBE_RESP). |
| 1532 | * | 1535 | * |
| 1533 | * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32. | 1536 | * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32. |
| 1534 | * As specified in the &enum nl80211_rxmgmt_flags. | 1537 | * As specified in the &enum nl80211_rxmgmt_flags. |
| @@ -1576,6 +1579,11 @@ enum nl80211_commands { · 41 unmodified lines | |||
| 1576 | * advertise values that cannot always be met. In such cases, an attempt | 1579 | * advertise values that cannot always be met. In such cases, an attempt |
| 1577 | * to add a new station entry with @NL80211_CMD_NEW_STATION may fail. | 1580 | * to add a new station entry with @NL80211_CMD_NEW_STATION may fail. |
| 1578 | * | 1581 | * |
| 1582 | * @NL80211_ATTR_CSA_C_OFFSETS_TX: An array of csa counter offsets (u16) which | ||
| 1583 | * should be updated when the frame is transmitted. | ||
| 1584 | * @NL80211_ATTR_MAX_CSA_COUNTERS: U8 attribute used to advertise the maximum | ||
| 1585 | * supported number of csa counters. | ||
| 1586 | * | ||
| 1579 | * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32. | 1587 | * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32. |
| 1580 | * As specified in the &enum nl80211_tdls_peer_capability. | 1588 | * As specified in the &enum nl80211_tdls_peer_capability. |
| 1581 | * | 1589 | * |
| @@ -1920,6 +1928,9 @@ enum nl80211_attrs { · 338 unmodified lines | |||
| 1920 | 1928 | ||
| 1921 | NL80211_ATTR_IFACE_SOCKET_OWNER, | 1929 | NL80211_ATTR_IFACE_SOCKET_OWNER, |
| 1922 | 1930 | ||
| 1931 | NL80211_ATTR_CSA_C_OFFSETS_TX, | ||
| 1932 | NL80211_ATTR_MAX_CSA_COUNTERS, | ||
| 1933 | |||
| 1923 | /* add attributes here, update the policy in nl80211.c */ | 1934 | /* add attributes here, update the policy in nl80211.c */ |
| 1924 | 1935 | ||
| 1925 | __NL80211_ATTR_AFTER_LAST, | 1936 | __NL80211_ATTR_AFTER_LAST, |
| @@ -2188,6 +2199,8 @@ enum nl80211_sta_bss_param { · 262 unmodified lines | |||
| 2188 | * Contains a nested array of signal strength attributes (u8, dBm) | 2199 | * Contains a nested array of signal strength attributes (u8, dBm) |
| 2189 | * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average | 2200 | * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average |
| 2190 | * Same format as NL80211_STA_INFO_CHAIN_SIGNAL. | 2201 | * Same format as NL80211_STA_INFO_CHAIN_SIGNAL. |
| 2202 | * @NL80211_STA_EXPECTED_THROUGHPUT: expected throughput considering also the | ||
| 2203 | * 802.11 header (u32, kbps) | ||
| 2191 | * @__NL80211_STA_INFO_AFTER_LAST: internal | 2204 | * @__NL80211_STA_INFO_AFTER_LAST: internal |
| 2192 | * @NL80211_STA_INFO_MAX: highest possible station info attribute | 2205 | * @NL80211_STA_INFO_MAX: highest possible station info attribute |
| 2193 | */ | 2206 | */ |
| @@ -2219,6 +2232,7 @@ enum nl80211_sta_info { · 25 unmodified lines | |||
| 2219 | NL80211_STA_INFO_TX_BYTES64, | 2232 | NL80211_STA_INFO_TX_BYTES64, |
| 2220 | NL80211_STA_INFO_CHAIN_SIGNAL, | 2233 | NL80211_STA_INFO_CHAIN_SIGNAL, |
| 2221 | NL80211_STA_INFO_CHAIN_SIGNAL_AVG, | 2234 | NL80211_STA_INFO_CHAIN_SIGNAL_AVG, |
| 2235 | NL80211_STA_INFO_EXPECTED_THROUGHPUT, | ||
| 2222 | 2236 | ||
| 2223 | /* keep last */ | 2237 | /* keep last */ |
| 2224 | __NL80211_STA_INFO_AFTER_LAST, | 2238 | __NL80211_STA_INFO_AFTER_LAST, |
| @@ -3688,6 +3702,8 @@ enum nl80211_iface_limit_attrs { · 1463 unmodified lines | |||
| 3688 | * different channels may be used within this group. | 3702 | * different channels may be used within this group. |
| 3689 | * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap | 3703 | * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap |
| 3690 | * of supported channel widths for radar detection. | 3704 | * of supported channel widths for radar detection. |
| 3705 | * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap | ||
| 3706 | * of supported regulatory regions for radar detection. | ||
| 3691 | * @NUM_NL80211_IFACE_COMB: number of attributes | 3707 | * @NUM_NL80211_IFACE_COMB: number of attributes |
| 3692 | * @MAX_NL80211_IFACE_COMB: highest attribute number | 3708 | * @MAX_NL80211_IFACE_COMB: highest attribute number |
| 3693 | * | 3709 | * |
| @@ -3721,6 +3737,7 @@ enum nl80211_if_combination_attrs { · 27 unmodified lines | |||
| 3721 | NL80211_IFACE_COMB_STA_AP_BI_MATCH, | 3737 | NL80211_IFACE_COMB_STA_AP_BI_MATCH, |
| 3722 | NL80211_IFACE_COMB_NUM_CHANNELS, | 3738 | NL80211_IFACE_COMB_NUM_CHANNELS, |
| 3723 | NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS, | 3739 | NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS, |
| 3740 | NL80211_IFACE_COMB_RADAR_DETECT_REGIONS, | ||
| 3724 | 3741 | ||
| 3725 | /* keep last */ | 3742 | /* keep last */ |
| 3726 | NUM_NL80211_IFACE_COMB, | 3743 | NUM_NL80211_IFACE_COMB, |