History

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

John W. Linville committed 13 years ago

Commit 7d2a47a2 parents fedaf4f b887664210 files · +27577 −2842Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/nfc.h +17 −1
  2. include/uapi/linux/nl80211.h +9 −0
include/uapi/linux/nfc.h+17−1
@@ -69,6 +69,8 @@ · 68 unmodified lines
69 * starting a poll from a device which has a secure element enabled means69 * starting a poll from a device which has a secure element enabled means
70 * we want to do SE based card emulation.70 * we want to do SE based card emulation.
71 * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.71 * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
72 * @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that
73 * some firmware was loaded
72 */74 */
73enum nfc_commands {75enum nfc_commands {
74 NFC_CMD_UNSPEC,76 NFC_CMD_UNSPEC,
@@ -92,6 +94,9 @@ enum nfc_commands { · 17 unmodified lines
92 NFC_CMD_DISABLE_SE,94 NFC_CMD_DISABLE_SE,
93 NFC_CMD_LLC_SDREQ,95 NFC_CMD_LLC_SDREQ,
94 NFC_EVENT_LLC_SDRES,96 NFC_EVENT_LLC_SDRES,
97 NFC_CMD_FW_UPLOAD,
98 NFC_EVENT_SE_ADDED,
99 NFC_EVENT_SE_REMOVED,
95/* private: internal use only */100/* private: internal use only */
96 __NFC_CMD_AFTER_LAST101 __NFC_CMD_AFTER_LAST
97};102};
@@ -121,6 +126,9 @@ enum nfc_commands { · 23 unmodified lines
121 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter126 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter
122 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter127 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter
123 * @NFC_ATTR_SE: Available Secure Elements128 * @NFC_ATTR_SE: Available Secure Elements
129 * @NFC_ATTR_FIRMWARE_NAME: Free format firmware version
130 * @NFC_ATTR_SE_INDEX: Secure element index
131 * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)
124 */132 */
125enum nfc_attrs {133enum nfc_attrs {
126 NFC_ATTR_UNSPEC,134 NFC_ATTR_UNSPEC,
@@ -143,6 +151,9 @@ enum nfc_attrs { · 16 unmodified lines
143 NFC_ATTR_LLC_PARAM_MIUX,151 NFC_ATTR_LLC_PARAM_MIUX,
144 NFC_ATTR_SE,152 NFC_ATTR_SE,
145 NFC_ATTR_LLC_SDP,153 NFC_ATTR_LLC_SDP,
154 NFC_ATTR_FIRMWARE_NAME,
155 NFC_ATTR_SE_INDEX,
156 NFC_ATTR_SE_TYPE,
146/* private: internal use only */157/* private: internal use only */
147 __NFC_ATTR_AFTER_LAST158 __NFC_ATTR_AFTER_LAST
148};159};
@@ -159,9 +170,12 @@ enum nfc_sdp_attr { · 10 unmodified lines
159 170
160#define NFC_DEVICE_NAME_MAXSIZE 8171#define NFC_DEVICE_NAME_MAXSIZE 8
161#define NFC_NFCID1_MAXSIZE 10172#define NFC_NFCID1_MAXSIZE 10
173#define NFC_NFCID2_MAXSIZE 8
174#define NFC_NFCID3_MAXSIZE 10
162#define NFC_SENSB_RES_MAXSIZE 12175#define NFC_SENSB_RES_MAXSIZE 12
163#define NFC_SENSF_RES_MAXSIZE 18176#define NFC_SENSF_RES_MAXSIZE 18
164#define NFC_GB_MAXSIZE 48177#define NFC_GB_MAXSIZE 48
178#define NFC_FIRMWARE_NAME_MAXSIZE 32
165 179
166/* NFC protocols */180/* NFC protocols */
167#define NFC_PROTO_JEWEL 1181#define NFC_PROTO_JEWEL 1
@@ -191,10 +205,12 @@ enum nfc_sdp_attr { · 23 unmodified lines
191#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)205#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
192 206
193/* NFC Secure Elements */207/* NFC Secure Elements */
194#define NFC_SE_NONE 0x0
195#define NFC_SE_UICC 0x1208#define NFC_SE_UICC 0x1
196#define NFC_SE_EMBEDDED 0x2209#define NFC_SE_EMBEDDED 0x2
197 210
211#define NFC_SE_DISABLED 0x0
212#define NFC_SE_ENABLED 0x1
213
198struct sockaddr_nfc {214struct sockaddr_nfc {
199 sa_family_t sa_family;215 sa_family_t sa_family;
200 __u32 dev_idx;216 __u32 dev_idx;
include/uapi/linux/nl80211.h+9−0
@@ -2577,6 +2577,10 @@ enum nl80211_mesh_power_mode { · 2576 unmodified lines
2577 *2577 *
2578 * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)2578 * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)
2579 *2579 *
2580 * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've
2581 * established peering with for longer than this time (in seconds), then
2582 * remove it from the STA's list of peers. Default is 30 minutes.
2583 *
2580 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use2584 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
2581 */2585 */
2582enum nl80211_meshconf_params {2586enum nl80211_meshconf_params {
@@ -2608,6 +2612,7 @@ enum nl80211_meshconf_params { · 25 unmodified lines
2608 NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,2612 NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
2609 NL80211_MESHCONF_POWER_MODE,2613 NL80211_MESHCONF_POWER_MODE,
2610 NL80211_MESHCONF_AWAKE_WINDOW,2614 NL80211_MESHCONF_AWAKE_WINDOW,
2615 NL80211_MESHCONF_PLINK_TIMEOUT,
2611 2616
2612 /* keep last */2617 /* keep last */
2613 __NL80211_MESHCONF_ATTR_AFTER_LAST,2618 __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -3579,6 +3584,10 @@ enum nl80211_ap_sme_features { · 965 unmodified lines
3579 * Peering Management entity which may be implemented by registering for3584 * Peering Management entity which may be implemented by registering for
3580 * beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is3585 * beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is
3581 * still generated by the driver.3586 * still generated by the driver.
3587 * @NL80211_FEATURE_ACTIVE_MONITOR: This driver supports an active monitor
3588 * interface. An active monitor interface behaves like a normal monitor
3589 * interface, but gets added to the driver. It ensures that incoming
3590 * unicast packets directed at the configured interface address get ACKed.
3582 */3591 */
3583enum nl80211_feature_flags {3592enum nl80211_feature_flags {
3584 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,3593 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t