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 6ed0e322 parents 3dec224 b006ed5257 files · +9897 −5629Browse files

Showing the changes to include/uapi/linux (3 of 257 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/nfc.h +5 −2
  2. include/uapi/linux/nl80211.h +39 −0
  3. include/uapi/linux/rfkill.h +2 −0
include/uapi/linux/nfc.h+5−2
@@ -233,7 +233,10 @@ struct sockaddr_nfc_llcp { · 232 unmodified lines
233233 #define NFC_LLCP_DIRECTION_TX 0x01
234234
235235 /* socket option names */
236−#define NFC_LLCP_RW 0
237−#define NFC_LLCP_MIUX 1
236+#define NFC_LLCP_RW 0
237+#define NFC_LLCP_MIUX 1
238+#define NFC_LLCP_REMOTE_MIU 2
239+#define NFC_LLCP_REMOTE_LTO 3
240+#define NFC_LLCP_REMOTE_RW 4
238241
239242 #endif /*__LINUX_NFC_H */
include/uapi/linux/nl80211.h+39−0
@@ -639,6 +639,13 @@ · 638 unmodified lines
639639 * with the relevant Information Elements. This event is used to report
640640 * received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE).
641641 *
642+ * @NL80211_CMD_CRIT_PROTOCOL_START: Indicates user-space will start running
643+ * a critical protocol that needs more reliability in the connection to
644+ * complete.
645+ *
646+ * @NL80211_CMD_CRIT_PROTOCOL_STOP: Indicates the connection reliability can
647+ * return back to normal.
648+ *
642649 * @NL80211_CMD_MAX: highest used command number
643650 * @__NL80211_CMD_AFTER_LAST: internal use
644651 */
@@ -798,6 +805,9 @@ enum nl80211_commands { · 153 unmodified lines
798805 NL80211_CMD_UPDATE_FT_IES,
799806 NL80211_CMD_FT_EVENT,
800807
808+ NL80211_CMD_CRIT_PROTOCOL_START,
809+ NL80211_CMD_CRIT_PROTOCOL_STOP,
810+
801811 /* add new commands above here */
802812
803813 /* used to define NL80211_CMD_MAX below */
@@ -1414,6 +1424,11 @@ enum nl80211_commands { · 610 unmodified lines
14141424 * @NL80211_ATTR_IE_RIC: Resource Information Container Information
14151425 * Element
14161426 *
1427+ * @NL80211_ATTR_CRIT_PROT_ID: critical protocol identifier requiring increased
1428+ * reliability, see &enum nl80211_crit_proto_id (u16).
1429+ * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which
1430+ * the connection should have increased reliability (u16).
1431+ *
14171432 * @NL80211_ATTR_MAX: highest attribute number currently defined
14181433 * @__NL80211_ATTR_AFTER_LAST: internal use
14191434 */
@@ -1709,6 +1724,9 @@ enum nl80211_attrs { · 289 unmodified lines
17091724 NL80211_ATTR_MDID,
17101725 NL80211_ATTR_IE_RIC,
17111726
1727+ NL80211_ATTR_CRIT_PROT_ID,
1728+ NL80211_ATTR_MAX_CRIT_PROT_DURATION,
1729+
17121730 /* add attributes here, update the policy in nl80211.c */
17131731
17141732 __NL80211_ATTR_AFTER_LAST,
@@ -3682,4 +3700,25 @@ enum nl80211_protocol_features { · 1967 unmodified lines
36823700 NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP = 1 << 0,
36833701 };
36843702
3703+/**
3704+ * enum nl80211_crit_proto_id - nl80211 critical protocol identifiers
3705+ *
3706+ * @NL80211_CRIT_PROTO_UNSPEC: protocol unspecified.
3707+ * @NL80211_CRIT_PROTO_DHCP: BOOTP or DHCPv6 protocol.
3708+ * @NL80211_CRIT_PROTO_EAPOL: EAPOL protocol.
3709+ * @NL80211_CRIT_PROTO_APIPA: APIPA protocol.
3710+ * @NUM_NL80211_CRIT_PROTO: must be kept last.
3711+ */
3712+enum nl80211_crit_proto_id {
3713+ NL80211_CRIT_PROTO_UNSPEC,
3714+ NL80211_CRIT_PROTO_DHCP,
3715+ NL80211_CRIT_PROTO_EAPOL,
3716+ NL80211_CRIT_PROTO_APIPA,
3717+ /* add other protocols before this one */
3718+ NUM_NL80211_CRIT_PROTO
3719+};
3720+
3721+/* maximum duration for critical protocol measures */
3722+#define NL80211_CRIT_PROTO_MAX_DURATION 5000 /* msec */
3723+
36853724 #endif /* __LINUX_NL80211_H */
include/uapi/linux/rfkill.h+2−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
3737 * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
3838 * @RFKILL_TYPE_GPS: switch is on a GPS device.
3939 * @RFKILL_TYPE_FM: switch is on a FM radio device.
40+ * @RFKILL_TYPE_NFC: switch is on an NFC device.
4041 * @NUM_RFKILL_TYPES: number of defined rfkill types
4142 */
4243 enum rfkill_type {
@@ -48,6 +49,7 @@ enum rfkill_type { · 5 unmodified lines
4849 RFKILL_TYPE_WWAN,
4950 RFKILL_TYPE_GPS,
5051 RFKILL_TYPE_FM,
52+ RFKILL_TYPE_NFC,
5153 NUM_RFKILL_TYPES,
5254 };
5355

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