History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

John W. Linville committed 12 years ago

Commit 49c0ca12 parents a85ae0e 67b3bd4215 files · +13523 −2758Browse files

Showing the changes to include/uapi/linux (2 of 215 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nfc.h +8 −1
  2. include/uapi/linux/nl80211.h +6 −0
include/uapi/linux/nfc.h+8−1
@@ -150,6 +150,8 @@ enum nfc_commands { · 149 unmodified lines
150150 * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)
151151 * @NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS: Firmware download operation status
152152 * @NFC_ATTR_APDU: Secure element APDU
153+ * @NFC_ATTR_TARGET_ISO15693_DSFID: ISO 15693 Data Storage Format Identifier
154+ * @NFC_ATTR_TARGET_ISO15693_UID: ISO 15693 Unique Identifier
153155 */
154156 enum nfc_attrs {
155157 NFC_ATTR_UNSPEC,
@@ -178,6 +180,8 @@ enum nfc_attrs { · 22 unmodified lines
178180 NFC_ATTR_SE_AID,
179181 NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS,
180182 NFC_ATTR_SE_APDU,
183+ NFC_ATTR_TARGET_ISO15693_DSFID,
184+ NFC_ATTR_TARGET_ISO15693_UID,
181185 /* private: internal use only */
182186 __NFC_ATTR_AFTER_LAST
183187 };
@@ -200,6 +204,7 @@ enum nfc_sdp_attr { · 16 unmodified lines
200204 #define NFC_SENSF_RES_MAXSIZE 18
201205 #define NFC_GB_MAXSIZE 48
202206 #define NFC_FIRMWARE_NAME_MAXSIZE 32
207+#define NFC_ISO15693_UID_MAXSIZE 8
203208
204209 /* NFC protocols */
205210 #define NFC_PROTO_JEWEL 1
@@ -208,8 +213,9 @@ enum nfc_sdp_attr { · 2 unmodified lines
208213 #define NFC_PROTO_ISO14443 4
209214 #define NFC_PROTO_NFC_DEP 5
210215 #define NFC_PROTO_ISO14443_B 6
216+#define NFC_PROTO_ISO15693 7
211217
212−#define NFC_PROTO_MAX 7
218+#define NFC_PROTO_MAX 8
213219
214220 /* NFC communication modes */
215221 #define NFC_COMM_ACTIVE 0
@@ -227,6 +233,7 @@ enum nfc_sdp_attr { · 11 unmodified lines
227233 #define NFC_PROTO_ISO14443_MASK (1 << NFC_PROTO_ISO14443)
228234 #define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP)
229235 #define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
236+#define NFC_PROTO_ISO15693_MASK (1 << NFC_PROTO_ISO15693)
230237
231238 /* NFC Secure Elements */
232239 #define NFC_SE_UICC 0x1
include/uapi/linux/nl80211.h+6−0
@@ -2335,6 +2335,7 @@ enum nl80211_band_attr { · 2334 unmodified lines
23352335 * @NL80211_FREQUENCY_ATTR_NO_160MHZ: any 160 MHz (but not 80+80) channel
23362336 * using this channel as the primary or any of the secondary channels
23372337 * isn't possible
2338+ * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
23382339 * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
23392340 * currently defined
23402341 * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
@@ -2353,6 +2354,7 @@ enum nl80211_frequency_attr { · 12 unmodified lines
23532354 NL80211_FREQUENCY_ATTR_NO_HT40_PLUS,
23542355 NL80211_FREQUENCY_ATTR_NO_80MHZ,
23552356 NL80211_FREQUENCY_ATTR_NO_160MHZ,
2357+ NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
23562358
23572359 /* keep last */
23582360 __NL80211_FREQUENCY_ATTR_AFTER_LAST,
@@ -2449,6 +2451,8 @@ enum nl80211_reg_type { · 90 unmodified lines
24492451 * If you don't have one then don't send this.
24502452 * @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
24512453 * a given frequency range. The value is in mBm (100 * dBm).
2454+ * @NL80211_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
2455+ * If not present or 0 default CAC time will be used.
24522456 * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
24532457 * currently defined
24542458 * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
@@ -2464,6 +2468,8 @@ enum nl80211_reg_rule_attr { · 9 unmodified lines
24642468 NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN,
24652469 NL80211_ATTR_POWER_RULE_MAX_EIRP,
24662470
2471+ NL80211_ATTR_DFS_CAC_TIME,
2472+
24672473 /* keep last */
24682474 __NL80211_REG_RULE_ATTR_AFTER_LAST,
24692475 NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1