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 0d8165e2 parents 4c9d546 076f0d2241 files · +5440 −2926Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/nfc.h +20 −0
  2. include/uapi/linux/nl80211.h +16 −0
include/uapi/linux/nfc.h+20−0
@@ -71,6 +71,20 @@ · 70 unmodified lines
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_DOWNLOAD: Request to Load/flash firmware, or event to inform72 * @NFC_CMD_FW_DOWNLOAD: Request to Load/flash firmware, or event to inform
73 * that some firmware was loaded73 * that some firmware was loaded
74 * @NFC_EVENT_SE_ADDED: Event emitted when a new secure element is discovered.
75 * This typically will be sent whenever a new NFC controller with either
76 * an embedded SE or an UICC one connected to it through SWP.
77 * @NFC_EVENT_SE_REMOVED: Event emitted when a secure element is removed from
78 * the system, as a consequence of e.g. an NFC controller being unplugged.
79 * @NFC_EVENT_SE_CONNECTIVITY: This event is emitted whenever a secure element
80 * is requesting connectivity access. For example a UICC SE may need to
81 * talk with a sleeping modem and will notify this need by sending this
82 * event. It is then up to userspace to decide if it will wake the modem
83 * up or not.
84 * @NFC_EVENT_SE_TRANSACTION: This event is sent when an application running on
85 * a specific SE notifies us about the end of a transaction. The parameter
86 * for this event is the application ID (AID).
87 * @NFC_CMD_GET_SE: Dump all discovered secure elements from an NFC controller.
74 */88 */
75enum nfc_commands {89enum nfc_commands {
76 NFC_CMD_UNSPEC,90 NFC_CMD_UNSPEC,
@@ -97,6 +111,9 @@ enum nfc_commands { · 20 unmodified lines
97 NFC_CMD_FW_DOWNLOAD,111 NFC_CMD_FW_DOWNLOAD,
98 NFC_EVENT_SE_ADDED,112 NFC_EVENT_SE_ADDED,
99 NFC_EVENT_SE_REMOVED,113 NFC_EVENT_SE_REMOVED,
114 NFC_EVENT_SE_CONNECTIVITY,
115 NFC_EVENT_SE_TRANSACTION,
116 NFC_CMD_GET_SE,
100/* private: internal use only */117/* private: internal use only */
101 __NFC_CMD_AFTER_LAST118 __NFC_CMD_AFTER_LAST
102};119};
@@ -129,6 +146,7 @@ enum nfc_commands { · 26 unmodified lines
129 * @NFC_ATTR_FIRMWARE_NAME: Free format firmware version146 * @NFC_ATTR_FIRMWARE_NAME: Free format firmware version
130 * @NFC_ATTR_SE_INDEX: Secure element index147 * @NFC_ATTR_SE_INDEX: Secure element index
131 * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)148 * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)
149 * @NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS: Firmware download operation status
132 */150 */
133enum nfc_attrs {151enum nfc_attrs {
134 NFC_ATTR_UNSPEC,152 NFC_ATTR_UNSPEC,
@@ -154,6 +172,8 @@ enum nfc_attrs { · 19 unmodified lines
154 NFC_ATTR_FIRMWARE_NAME,172 NFC_ATTR_FIRMWARE_NAME,
155 NFC_ATTR_SE_INDEX,173 NFC_ATTR_SE_INDEX,
156 NFC_ATTR_SE_TYPE,174 NFC_ATTR_SE_TYPE,
175 NFC_ATTR_SE_AID,
176 NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS,
157/* private: internal use only */177/* private: internal use only */
158 __NFC_ATTR_AFTER_LAST178 __NFC_ATTR_AFTER_LAST
159};179};
include/uapi/linux/nl80211.h+16−0
@@ -1493,6 +1493,9 @@ enum nl80211_commands { · 1492 unmodified lines
1493 * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter1493 * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
1494 * field in the probe response (%NL80211_ATTR_PROBE_RESP).1494 * field in the probe response (%NL80211_ATTR_PROBE_RESP).
1495 *1495 *
1496 * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
1497 * As specified in the &enum nl80211_rxmgmt_flags.
1498 *
1496 * @NL80211_ATTR_MAX: highest attribute number currently defined1499 * @NL80211_ATTR_MAX: highest attribute number currently defined
1497 * @__NL80211_ATTR_AFTER_LAST: internal use1500 * @__NL80211_ATTR_AFTER_LAST: internal use
1498 */1501 */
@@ -1801,6 +1804,8 @@ enum nl80211_attrs { · 302 unmodified lines
1801 NL80211_ATTR_CSA_C_OFF_BEACON,1804 NL80211_ATTR_CSA_C_OFF_BEACON,
1802 NL80211_ATTR_CSA_C_OFF_PRESP,1805 NL80211_ATTR_CSA_C_OFF_PRESP,
1803 1806
1807 NL80211_ATTR_RXMGMT_FLAGS,
1808
1804 /* add attributes here, update the policy in nl80211.c */1809 /* add attributes here, update the policy in nl80211.c */
1805 1810
1806 __NL80211_ATTR_AFTER_LAST,1811 __NL80211_ATTR_AFTER_LAST,
@@ -3901,4 +3906,15 @@ enum nl80211_crit_proto_id { · 2094 unmodified lines
3901/* maximum duration for critical protocol measures */3906/* maximum duration for critical protocol measures */
3902#define NL80211_CRIT_PROTO_MAX_DURATION 5000 /* msec */3907#define NL80211_CRIT_PROTO_MAX_DURATION 5000 /* msec */
3903 3908
3909/**
3910 * enum nl80211_rxmgmt_flags - flags for received management frame.
3911 *
3912 * Used by cfg80211_rx_mgmt()
3913 *
3914 * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
3915 */
3916enum nl80211_rxmgmt_flags {
3917 NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
3918};
3919
3904#endif /* __LINUX_NL80211_H */3920#endif /* __LINUX_NL80211_H */