Showing the changes to include/uapi (2 of 233 files). Show all
Unified · Split
| @@ -60,6 +60,13 @@ · 59 unmodified lines | ||
| 60 | 60 | * target mode. |
| 61 | 61 | * @NFC_EVENT_DEVICE_DEACTIVATED: event emitted when the adapter is deactivated |
| 62 | 62 | * from target mode. |
| 63 | + * @NFC_CMD_LLC_GET_PARAMS: request LTO, RW, and MIUX parameters for a device | |
| 64 | + * @NFC_CMD_LLC_SET_PARAMS: set one or more of LTO, RW, and MIUX parameters for | |
| 65 | + * a device. LTO must be set before the link is up otherwise -EINPROGRESS | |
| 66 | + * is returned. RW and MIUX can be set at anytime and will be passed in | |
| 67 | + * subsequent CONNECT and CC messages. | |
| 68 | + * If one of the passed parameters is wrong none is set and -EINVAL is | |
| 69 | + * returned. | |
| 63 | 70 | */ |
| 64 | 71 | enum nfc_commands { |
| 65 | 72 | NFC_CMD_UNSPEC, |
| @@ -77,6 +84,8 @@ enum nfc_commands { · 11 unmodified lines | ||
| 77 | 84 | NFC_EVENT_TARGET_LOST, |
| 78 | 85 | NFC_EVENT_TM_ACTIVATED, |
| 79 | 86 | NFC_EVENT_TM_DEACTIVATED, |
| 87 | + NFC_CMD_LLC_GET_PARAMS, | |
| 88 | + NFC_CMD_LLC_SET_PARAMS, | |
| 80 | 89 | /* private: internal use only */ |
| 81 | 90 | __NFC_CMD_AFTER_LAST |
| 82 | 91 | }; |
| @@ -102,6 +111,9 @@ enum nfc_commands { · 19 unmodified lines | ||
| 102 | 111 | * @NFC_ATTR_RF_MODE: Initiator or target |
| 103 | 112 | * @NFC_ATTR_IM_PROTOCOLS: Initiator mode protocols to poll for |
| 104 | 113 | * @NFC_ATTR_TM_PROTOCOLS: Target mode protocols to listen for |
| 114 | + * @NFC_ATTR_LLC_PARAM_LTO: Link TimeOut parameter | |
| 115 | + * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter | |
| 116 | + * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter | |
| 105 | 117 | */ |
| 106 | 118 | enum nfc_attrs { |
| 107 | 119 | NFC_ATTR_UNSPEC, |
| @@ -119,6 +131,9 @@ enum nfc_attrs { · 11 unmodified lines | ||
| 119 | 131 | NFC_ATTR_DEVICE_POWERED, |
| 120 | 132 | NFC_ATTR_IM_PROTOCOLS, |
| 121 | 133 | NFC_ATTR_TM_PROTOCOLS, |
| 134 | + NFC_ATTR_LLC_PARAM_LTO, | |
| 135 | + NFC_ATTR_LLC_PARAM_RW, | |
| 136 | + NFC_ATTR_LLC_PARAM_MIUX, | |
| 122 | 137 | /* private: internal use only */ |
| 123 | 138 | __NFC_ATTR_AFTER_LAST |
| 124 | 139 | }; |
| @@ -1273,6 +1273,14 @@ enum nl80211_commands { · 1272 unmodified lines | ||
| 1273 | 1273 | * the connection request from a station. nl80211_connect_failed_reason |
| 1274 | 1274 | * enum has different reasons of connection failure. |
| 1275 | 1275 | * |
| 1276 | + * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts | |
| 1277 | + * with the Authentication transaction sequence number field. | |
| 1278 | + * | |
| 1279 | + * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from | |
| 1280 | + * association request when used with NL80211_CMD_NEW_STATION) | |
| 1281 | + * | |
| 1282 | + * @NL80211_ATTR_SCAN_FLAGS: scan request control flags (u32) | |
| 1283 | + * | |
| 1276 | 1284 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 1277 | 1285 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| 1278 | 1286 | */ |
| @@ -1530,6 +1538,12 @@ enum nl80211_attrs { · 251 unmodified lines | ||
| 1530 | 1538 | |
| 1531 | 1539 | NL80211_ATTR_CONN_FAILED_REASON, |
| 1532 | 1540 | |
| 1541 | + NL80211_ATTR_SAE_DATA, | |
| 1542 | + | |
| 1543 | + NL80211_ATTR_VHT_CAPABILITY, | |
| 1544 | + | |
| 1545 | + NL80211_ATTR_SCAN_FLAGS, | |
| 1546 | + | |
| 1533 | 1547 | /* add attributes here, update the policy in nl80211.c */ |
| 1534 | 1548 | |
| 1535 | 1549 | __NL80211_ATTR_AFTER_LAST, |
| @@ -1573,6 +1587,7 @@ enum nl80211_attrs { · 37 unmodified lines | ||
| 1573 | 1587 | #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16 |
| 1574 | 1588 | #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24 |
| 1575 | 1589 | #define NL80211_HT_CAPABILITY_LEN 26 |
| 1590 | +#define NL80211_VHT_CAPABILITY_LEN 12 | |
| 1576 | 1591 | |
| 1577 | 1592 | #define NL80211_MAX_NR_CIPHER_SUITES 5 |
| 1578 | 1593 | #define NL80211_MAX_NR_AKM_SUITES 2 |
| @@ -2489,6 +2504,7 @@ enum nl80211_bss_status { · 910 unmodified lines | ||
| 2489 | 2504 | * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only) |
| 2490 | 2505 | * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r) |
| 2491 | 2506 | * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP) |
| 2507 | + * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals | |
| 2492 | 2508 | * @__NL80211_AUTHTYPE_NUM: internal |
| 2493 | 2509 | * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm |
| 2494 | 2510 | * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by |
| @@ -2500,6 +2516,7 @@ enum nl80211_auth_type { · 5 unmodified lines | ||
| 2500 | 2516 | NL80211_AUTHTYPE_SHARED_KEY, |
| 2501 | 2517 | NL80211_AUTHTYPE_FT, |
| 2502 | 2518 | NL80211_AUTHTYPE_NETWORK_EAP, |
| 2519 | + NL80211_AUTHTYPE_SAE, | |
| 2503 | 2520 | |
| 2504 | 2521 | /* keep last */ |
| 2505 | 2522 | __NL80211_AUTHTYPE_NUM, |
| @@ -3028,6 +3045,12 @@ enum nl80211_ap_sme_features { · 522 unmodified lines | ||
| 3028 | 3045 | * in the interface combinations, even when it's only used for scan |
| 3029 | 3046 | * and remain-on-channel. This could be due to, for example, the |
| 3030 | 3047 | * remain-on-channel implementation requiring a channel context. |
| 3048 | + * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of | |
| 3049 | + * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station | |
| 3050 | + * mode | |
| 3051 | + * @NL80211_FEATURE_LOW_PRIORITY_SCAN: This driver supports low priority scan | |
| 3052 | + * @NL80211_FEATURE_SCAN_FLUSH: Scan flush is supported | |
| 3053 | + * @NL80211_FEATURE_AP_SCAN: Support scanning using an AP vif | |
| 3031 | 3054 | */ |
| 3032 | 3055 | enum nl80211_feature_flags { |
| 3033 | 3056 | NL80211_FEATURE_SK_TX_STATUS = 1 << 0, |
| @@ -3035,6 +3058,10 @@ enum nl80211_feature_flags { · 1 unmodified line | ||
| 3035 | 3058 | NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2, |
| 3036 | 3059 | NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3, |
| 3037 | 3060 | NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4, |
| 3061 | + NL80211_FEATURE_SAE = 1 << 5, | |
| 3062 | + NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6, | |
| 3063 | + NL80211_FEATURE_SCAN_FLUSH = 1 << 7, | |
| 3064 | + NL80211_FEATURE_AP_SCAN = 1 << 8, | |
| 3038 | 3065 | }; |
| 3039 | 3066 | |
| 3040 | 3067 | /** |
| @@ -3069,4 +3096,25 @@ enum nl80211_connect_failed_reason { · 28 unmodified lines | ||
| 3069 | 3096 | NL80211_CONN_FAIL_BLOCKED_CLIENT, |
| 3070 | 3097 | }; |
| 3071 | 3098 | |
| 3099 | +/** | |
| 3100 | + * enum nl80211_scan_flags - scan request control flags | |
| 3101 | + * | |
| 3102 | + * Scan request control flags are used to control the handling | |
| 3103 | + * of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN | |
| 3104 | + * requests. | |
| 3105 | + * | |
| 3106 | + * @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority | |
| 3107 | + * @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning | |
| 3108 | + * @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured | |
| 3109 | + * as AP and the beaconing has already been configured. This attribute is | |
| 3110 | + * dangerous because will destroy stations performance as a lot of frames | |
| 3111 | + * will be lost while scanning off-channel, therefore it must be used only | |
| 3112 | + * when really needed | |
| 3113 | + */ | |
| 3114 | +enum nl80211_scan_flags { | |
| 3115 | + NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0, | |
| 3116 | + NL80211_SCAN_FLAG_FLUSH = 1<<1, | |
| 3117 | + NL80211_SCAN_FLAG_AP = 1<<2, | |
| 3118 | +}; | |
| 3119 | + | |
| 3072 | 3120 | #endif /* __LINUX_NL80211_H */ |