[pkg-wpa-devel] r1770 - in /iw/branches/upstream/current: Makefile interface.c iw.8 mesh.c nl80211.h scan.c station.c util.c version.sh

slh-guest at users.alioth.debian.org slh-guest at users.alioth.debian.org
Tue Jun 26 12:21:46 UTC 2012


Author: slh-guest
Date: Tue Jun 26 12:21:46 2012
New Revision: 1770

URL: http://svn.debian.org/wsvn/?sc=1&rev=1770
Log:
[svn-upgrade] new version iw (3.5)

Modified:
    iw/branches/upstream/current/Makefile
    iw/branches/upstream/current/interface.c
    iw/branches/upstream/current/iw.8
    iw/branches/upstream/current/mesh.c
    iw/branches/upstream/current/nl80211.h
    iw/branches/upstream/current/scan.c
    iw/branches/upstream/current/station.c
    iw/branches/upstream/current/util.c
    iw/branches/upstream/current/version.sh

Modified: iw/branches/upstream/current/Makefile
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/Makefile?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/Makefile (original)
+++ iw/branches/upstream/current/Makefile Tue Jun 26 12:21:46 2012
@@ -22,11 +22,19 @@
 OBJS += sections.o
 ALL = iw
 
+NL3xFOUND := $(shell $(PKG_CONFIG) --atleast-version=3.2 libnl-3.0 && echo Y)
+ifneq ($(NL3xFOUND),Y)
+NL31FOUND := $(shell $(PKG_CONFIG) --exact-version=3.1 libnl-3.1 && echo Y)
+ifneq ($(NL31FOUND),Y)
+NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
+ifneq ($(NL3FOUND),Y)
+NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
+ifneq ($(NL2FOUND),Y)
 NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
-NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
-NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
-NL31FOUND := $(shell $(PKG_CONFIG) --exact-version=3.1 libnl-3.1 && echo Y)
-NL3xFOUND := $(shell $(PKG_CONFIG) --atleast-version=3.2 libnl-3.0 && echo Y)
+endif
+endif
+endif
+endif
 
 ifeq ($(NL1FOUND),Y)
 NLLIBNAME = libnl-1

Modified: iw/branches/upstream/current/interface.c
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/interface.c?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/interface.c (original)
+++ iw/branches/upstream/current/interface.c Tue Jun 26 12:21:46 2012
@@ -241,6 +241,22 @@
 	 "Remove this virtual interface");
 HIDDEN(interface, del, NULL, NL80211_CMD_DEL_INTERFACE, 0, CIB_NETDEV, handle_interface_del);
 
+static char *channel_type_name(enum nl80211_channel_type channel_type)
+{
+	switch (channel_type) {
+	case NL80211_CHAN_NO_HT:
+		return "NO HT";
+	case NL80211_CHAN_HT20:
+		return "HT20";
+	case NL80211_CHAN_HT40MINUS:
+		return "HT40-";
+	case NL80211_CHAN_HT40PLUS:
+		return "HT40+";
+	default:
+		return "unknown";
+	}
+}
+
 static int print_iface_handler(struct nl_msg *msg, void *arg)
 {
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
@@ -267,6 +283,17 @@
 		printf("%s\ttype %s\n", indent, iftype_name(nla_get_u32(tb_msg[NL80211_ATTR_IFTYPE])));
 	if (!wiphy && tb_msg[NL80211_ATTR_WIPHY])
 		printf("%s\twiphy %d\n", indent, nla_get_u32(tb_msg[NL80211_ATTR_WIPHY]));
+	if (tb_msg[NL80211_ATTR_WIPHY_FREQ]) {
+		uint32_t freq = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_FREQ]);
+		enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
+
+		if (tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE])
+			channel_type = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
+
+		printf("%s\tchannel %d (%d MHz) %s\n", indent,
+		       ieee80211_frequency_to_channel(freq), freq,
+		       channel_type_name(channel_type));
+	}
 
 	return NL_SKIP;
 }

Modified: iw/branches/upstream/current/iw.8
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/iw.8?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/iw.8 (original)
+++ iw/branches/upstream/current/iw.8 Tue Jun 26 12:21:46 2012
@@ -1,4 +1,4 @@
-.TH IW 8 "16 September 2008" "iw" "Linux"
+.TH IW 8 "7 June 2012" "iw" "Linux"
 .SH NAME
 iw \- show / manipulate wireless devices and their configuration
 .SH SYNOPSIS
@@ -8,7 +8,9 @@
 .ti -8
 .B iw
 .RI [ " OPTIONS " ] " " { "
-.BR help " |"
+.BR help " [ "
+.RI ""command " ]"
+.BR "|"
 .RI ""OBJECT " " COMMAND " }"
 .sp
 
@@ -56,7 +58,9 @@
 Specifies the action to perform on the object.
 The set of possible actions depends on the object type.
 .B iw help
-will print all supported commands.
+will print all supported commands, while
+.B iw help command
+will print the help for all matching commands.
 
 .SH SEE ALSO
 .BR ip (8),

Modified: iw/branches/upstream/current/mesh.c
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/mesh.c?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/mesh.c (original)
+++ iw/branches/upstream/current/mesh.c Tue Jun 26 12:21:46 2012
@@ -17,6 +17,7 @@
 typedef struct _any_t {
 	union {
 		uint32_t as_32;
+		int32_t as_s32;
 		uint16_t as_16;
 		uint8_t as_8;
 	} u;
@@ -96,6 +97,19 @@
 	return 0;
 }
 
+static uint32_t _parse_s32(const char *str, _any *ret)
+{
+	char *endptr = NULL;
+	long int v = strtol(str, &endptr, 10);
+	if (*endptr != '\0')
+		return 0xffffffff;
+	if (v > 0xff)
+		return 0xffffffff;
+	ret->u.as_s32 = (int32_t)v;
+	return 0;
+}
+
+
 static void _print_u8(struct nlattr *a)
 {
 	printf("%d", nla_get_u8(a));
@@ -116,6 +130,11 @@
 	printf("%d TUs", nla_get_u16(a));
 }
 
+static void _print_u32(struct nlattr *a)
+{
+	printf("%d", nla_get_u32(a));
+}
+
 static void _print_u32_timeout(struct nlattr *a)
 {
 	printf("%u milliseconds", nla_get_u32(a));
@@ -125,6 +144,12 @@
 {
 	printf("%d TUs", nla_get_u32(a));
 }
+
+static void _print_s32_in_dBm(struct nlattr *a)
+{
+	printf("%d dBm", (int32_t) nla_get_u32(a));
+}
+
 
 /* The current mesh parameters */
 const static struct mesh_param_descr _mesh_param_descrs[] =
@@ -179,6 +204,11 @@
 	_my_nla_put_u8, _parse_u8, _print_u8},
 	{"mesh_fwding", NL80211_MESHCONF_FORWARDING,
 	_my_nla_put_u8, _parse_u8_as_bool, _print_u8},
+	{"mesh_sync_offset_max_neighor",
+	NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
+	_my_nla_put_u32, _parse_u32, _print_u32},
+	{"mesh_rssi_threshold", NL80211_MESHCONF_RSSI_THRESHOLD,
+	_my_nla_put_u32, _parse_s32, _print_s32_in_dBm},
 };
 
 static void print_all_mesh_param_descr(void)
@@ -344,6 +374,7 @@
 static int join_mesh(struct nl80211_state *state, struct nl_cb *cb,
 		     struct nl_msg *msg, int argc, char **argv)
 {
+	struct nlattr *container;
 	float rate;
 	char *end;
 
@@ -366,6 +397,26 @@
 		argv++;
 		argc--;
 	}
+
+	container = nla_nest_start(msg, NL80211_ATTR_MESH_SETUP);
+	if (!container)
+		return -ENOBUFS;
+
+	if (argc > 1 && strcmp(argv[0], "vendor_sync") == 0) {
+		argv++;
+		argc--;
+		if (strcmp(argv[0], "on") == 0)
+			NLA_PUT_U8(msg,
+				   NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC, 1);
+		else
+			NLA_PUT_U8(msg,
+				   NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC, 0);
+		argv++;
+		argc--;
+	}
+	/* parse and put other NL80211_ATTR_MESH_SETUP elements here */
+
+	nla_nest_end(msg, container);
 
 	if (!argc)
 		return 0;
@@ -373,7 +424,8 @@
  nla_put_failure:
 	return -ENOBUFS;
 }
-COMMAND(mesh, join, "<mesh ID> [mcast-rate <rate in Mbps>] [<param>=<value>]*",
+COMMAND(mesh, join, "<mesh ID> [mcast-rate <rate in Mbps>] [vendor_sync on|off]"
+	" [<param>=<value>]*",
 	NL80211_CMD_JOIN_MESH, 0, CIB_NETDEV, join_mesh,
 	"Join a mesh with the given mesh ID with mcast-rate and mesh parameters.");
 

Modified: iw/branches/upstream/current/nl80211.h
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/nl80211.h?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/nl80211.h (original)
+++ iw/branches/upstream/current/nl80211.h Tue Jun 26 12:21:46 2012
@@ -548,6 +548,11 @@
  * @NL80211_CMD_SET_NOACK_MAP: sets a bitmap for the individual TIDs whether
  *      No Acknowledgement Policy should be applied.
  *
+ * @NL80211_CMD_CH_SWITCH_NOTIFY: An AP or GO may decide to switch channels
+ *	independently of the userspace SME, send this event indicating
+ *	%NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ with
+ *	%NL80211_ATTR_WIPHY_CHANNEL_TYPE.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -688,6 +693,8 @@
 	NL80211_CMD_UNEXPECTED_4ADDR_FRAME,
 
 	NL80211_CMD_SET_NOACK_MAP,
+
+	NL80211_CMD_CH_SWITCH_NOTIFY,
 
 	/* add new commands above here */
 
@@ -1587,6 +1594,8 @@
 	NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
 };
 
+#define NL80211_STA_FLAG_MAX_OLD_API	NL80211_STA_FLAG_TDLS_PEER
+
 /**
  * struct nl80211_sta_flag_update - station flags mask/set
  * @mask: mask of station flags to set
@@ -1685,6 +1694,7 @@
  * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected
  * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
  * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
+ * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
  * @__NL80211_STA_INFO_AFTER_LAST: internal
  * @NL80211_STA_INFO_MAX: highest possible station info attribute
  */
@@ -1708,6 +1718,7 @@
 	NL80211_STA_INFO_CONNECTED_TIME,
 	NL80211_STA_INFO_STA_FLAGS,
 	NL80211_STA_INFO_BEACON_LOSS,
+	NL80211_STA_INFO_T_OFFSET,
 
 	/* keep last */
 	__NL80211_STA_INFO_AFTER_LAST,
@@ -1985,9 +1996,9 @@
  * enum nl80211_dfs_regions - regulatory DFS regions
  *
  * @NL80211_DFS_UNSET: Country has no DFS master region specified
- * @NL80211_DFS_FCC_: Country follows DFS master rules from FCC
- * @NL80211_DFS_FCC_: Country follows DFS master rules from ETSI
- * @NL80211_DFS_JP_: Country follows DFS master rules from JP/MKK/Telec
+ * @NL80211_DFS_FCC: Country follows DFS master rules from FCC
+ * @NL80211_DFS_ETSI: Country follows DFS master rules from ETSI
+ * @NL80211_DFS_JP: Country follows DFS master rules from JP/MKK/Telec
  */
 enum nl80211_dfs_regions {
 	NL80211_DFS_UNSET	= 0,
@@ -2141,6 +2152,11 @@
  * a peer link.
  *
  * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
+ *
+ * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
+ * to synchronize to for 11s default synchronization method (see 11C.12.2.2)
+ *
+ * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.
  *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
@@ -2166,6 +2182,8 @@
 	NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
 	NL80211_MESHCONF_FORWARDING,
 	NL80211_MESHCONF_RSSI_THRESHOLD,
+	NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
+	NL80211_MESHCONF_HT_OPMODE,
 
 	/* keep last */
 	__NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2205,6 +2223,11 @@
  * complete (unsecured) mesh peering without the need of a userspace daemon.
  *
  * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
+ *
+ * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
+ * vendor specific synchronization method or disable it to use the default
+ * neighbor offset synchronization
+ *
  * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
  */
 enum nl80211_mesh_setup_params {
@@ -2214,6 +2237,7 @@
 	NL80211_MESH_SETUP_IE,
 	NL80211_MESH_SETUP_USERSPACE_AUTH,
 	NL80211_MESH_SETUP_USERSPACE_AMPE,
+	NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
 
 	/* keep last */
 	__NL80211_MESH_SETUP_ATTR_AFTER_LAST,
@@ -2223,7 +2247,7 @@
 /**
  * enum nl80211_txq_attr - TX queue parameter attributes
  * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved
- * @NL80211_TXQ_ATTR_QUEUE: TX queue identifier (NL80211_TXQ_Q_*)
+ * @NL80211_TXQ_ATTR_AC: AC identifier (NL80211_AC_*)
  * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
  *	disabled
  * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
@@ -2236,7 +2260,7 @@
  */
 enum nl80211_txq_attr {
 	__NL80211_TXQ_ATTR_INVALID,
-	NL80211_TXQ_ATTR_QUEUE,
+	NL80211_TXQ_ATTR_AC,
 	NL80211_TXQ_ATTR_TXOP,
 	NL80211_TXQ_ATTR_CWMIN,
 	NL80211_TXQ_ATTR_CWMAX,
@@ -2247,12 +2271,20 @@
 	NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1
 };
 
-enum nl80211_txq_q {
-	NL80211_TXQ_Q_VO,
-	NL80211_TXQ_Q_VI,
-	NL80211_TXQ_Q_BE,
-	NL80211_TXQ_Q_BK
-};
+enum nl80211_ac {
+	NL80211_AC_VO,
+	NL80211_AC_VI,
+	NL80211_AC_BE,
+	NL80211_AC_BK,
+	NL80211_NUM_ACS
+};
+
+/* backward compat */
+#define NL80211_TXQ_ATTR_QUEUE	NL80211_TXQ_ATTR_AC
+#define NL80211_TXQ_Q_VO	NL80211_AC_VO
+#define NL80211_TXQ_Q_VI	NL80211_AC_VI
+#define NL80211_TXQ_Q_BE	NL80211_AC_BE
+#define NL80211_TXQ_Q_BK	NL80211_AC_BK
 
 enum nl80211_channel_type {
 	NL80211_CHAN_NO_HT,

Modified: iw/branches/upstream/current/scan.c
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/scan.c?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/scan.c (original)
+++ iw/branches/upstream/current/scan.c Tue Jun 26 12:21:46 2012
@@ -675,6 +675,7 @@
 	[61] = { "HT operation", print_ht_op, 22, 22, BIT(PRINT_SCAN), },
 	[48] = { "RSN", print_rsn, 2, 255, BIT(PRINT_SCAN), },
 	[50] = { "Extended supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
+	[114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
 	[127] = { "Extended capabilities", print_capabilities, 0, 255, BIT(PRINT_SCAN), },
 };
 

Modified: iw/branches/upstream/current/station.c
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/station.c?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/station.c (original)
+++ iw/branches/upstream/current/station.c Tue Jun 26 12:21:46 2012
@@ -45,6 +45,7 @@
 		[NL80211_STA_INFO_RX_PACKETS] = { .type = NLA_U32 },
 		[NL80211_STA_INFO_TX_PACKETS] = { .type = NLA_U32 },
 		[NL80211_STA_INFO_SIGNAL] = { .type = NLA_U8 },
+		[NL80211_STA_INFO_T_OFFSET] = { .type = NLA_U64 },
 		[NL80211_STA_INFO_TX_BITRATE] = { .type = NLA_NESTED },
 		[NL80211_STA_INFO_LLID] = { .type = NLA_U16 },
 		[NL80211_STA_INFO_PLID] = { .type = NLA_U16 },
@@ -113,6 +114,9 @@
 	if (sinfo[NL80211_STA_INFO_SIGNAL_AVG])
 		printf("\n\tsignal avg:\t%d dBm",
 			(int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL_AVG]));
+	if (sinfo[NL80211_STA_INFO_T_OFFSET])
+		printf("\n\tToffset:\t%lld us",
+			(unsigned long long)nla_get_u64(sinfo[NL80211_STA_INFO_T_OFFSET]));
 
 	if (sinfo[NL80211_STA_INFO_TX_BITRATE]) {
 		if (nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX,

Modified: iw/branches/upstream/current/util.c
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/util.c?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/util.c (original)
+++ iw/branches/upstream/current/util.c Tue Jun 26 12:21:46 2012
@@ -145,6 +145,10 @@
 }
 
 static const char *commands[NL80211_CMD_MAX + 1] = {
+/*
+ * sed 's/^\tNL80211_CMD_//;t n;d;:n s%^\([^=]*\),.*%\t[NL80211_CMD_\1] = \"\L\1\",%;t;d' nl80211.h
+ */
+	[NL80211_CMD_UNSPEC] = "unspec",
 	[NL80211_CMD_GET_WIPHY] = "get_wiphy",
 	[NL80211_CMD_SET_WIPHY] = "set_wiphy",
 	[NL80211_CMD_NEW_WIPHY] = "new_wiphy",
@@ -159,8 +163,8 @@
 	[NL80211_CMD_DEL_KEY] = "del_key",
 	[NL80211_CMD_GET_BEACON] = "get_beacon",
 	[NL80211_CMD_SET_BEACON] = "set_beacon",
-	[NL80211_CMD_NEW_BEACON] = "new_beacon",
-	[NL80211_CMD_DEL_BEACON] = "del_beacon",
+	[NL80211_CMD_START_AP] = "start_ap",
+	[NL80211_CMD_STOP_AP] = "stop_ap",
 	[NL80211_CMD_GET_STATION] = "get_station",
 	[NL80211_CMD_SET_STATION] = "set_station",
 	[NL80211_CMD_NEW_STATION] = "new_station",
@@ -171,10 +175,9 @@
 	[NL80211_CMD_DEL_MPATH] = "del_mpath",
 	[NL80211_CMD_SET_BSS] = "set_bss",
 	[NL80211_CMD_SET_REG] = "set_reg",
-	[NL80211_CMD_REQ_SET_REG] = "reg_set_reg",
-	[NL80211_CMD_GET_MESH_PARAMS] = "get_mesh_params",
-	[NL80211_CMD_SET_MESH_PARAMS] = "set_mesh_params",
-	[NL80211_CMD_SET_MGMT_EXTRA_IE] = "set_mgmt_extra_ie",
+	[NL80211_CMD_REQ_SET_REG] = "req_set_reg",
+	[NL80211_CMD_GET_MESH_CONFIG] = "get_mesh_config",
+	[NL80211_CMD_SET_MESH_CONFIG] = "set_mesh_config",
 	[NL80211_CMD_GET_REG] = "get_reg",
 	[NL80211_CMD_GET_SCAN] = "get_scan",
 	[NL80211_CMD_TRIGGER_SCAN] = "trigger_scan",
@@ -195,20 +198,44 @@
 	[NL80211_CMD_DISCONNECT] = "disconnect",
 	[NL80211_CMD_SET_WIPHY_NETNS] = "set_wiphy_netns",
 	[NL80211_CMD_GET_SURVEY] = "get_survey",
+	[NL80211_CMD_NEW_SURVEY_RESULTS] = "new_survey_results",
 	[NL80211_CMD_SET_PMKSA] = "set_pmksa",
 	[NL80211_CMD_DEL_PMKSA] = "del_pmksa",
 	[NL80211_CMD_FLUSH_PMKSA] = "flush_pmksa",
 	[NL80211_CMD_REMAIN_ON_CHANNEL] = "remain_on_channel",
 	[NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL] = "cancel_remain_on_channel",
 	[NL80211_CMD_SET_TX_BITRATE_MASK] = "set_tx_bitrate_mask",
-	[NL80211_CMD_REGISTER_ACTION] = "register_action",
-	[NL80211_CMD_ACTION] = "action",
+	[NL80211_CMD_REGISTER_FRAME] = "register_frame",
+	[NL80211_CMD_FRAME] = "frame",
+	[NL80211_CMD_FRAME_TX_STATUS] = "frame_tx_status",
+	[NL80211_CMD_SET_POWER_SAVE] = "set_power_save",
+	[NL80211_CMD_GET_POWER_SAVE] = "get_power_save",
+	[NL80211_CMD_SET_CQM] = "set_cqm",
+	[NL80211_CMD_NOTIFY_CQM] = "notify_cqm",
 	[NL80211_CMD_SET_CHANNEL] = "set_channel",
 	[NL80211_CMD_SET_WDS_PEER] = "set_wds_peer",
 	[NL80211_CMD_FRAME_WAIT_CANCEL] = "frame_wait_cancel",
 	[NL80211_CMD_JOIN_MESH] = "join_mesh",
 	[NL80211_CMD_LEAVE_MESH] = "leave_mesh",
+	[NL80211_CMD_UNPROT_DEAUTHENTICATE] = "unprot_deauthenticate",
+	[NL80211_CMD_UNPROT_DISASSOCIATE] = "unprot_disassociate",
+	[NL80211_CMD_NEW_PEER_CANDIDATE] = "new_peer_candidate",
+	[NL80211_CMD_GET_WOWLAN] = "get_wowlan",
+	[NL80211_CMD_SET_WOWLAN] = "set_wowlan",
+	[NL80211_CMD_START_SCHED_SCAN] = "start_sched_scan",
+	[NL80211_CMD_STOP_SCHED_SCAN] = "stop_sched_scan",
+	[NL80211_CMD_SCHED_SCAN_RESULTS] = "sched_scan_results",
+	[NL80211_CMD_SCHED_SCAN_STOPPED] = "sched_scan_stopped",
 	[NL80211_CMD_SET_REKEY_OFFLOAD] = "set_rekey_offload",
+	[NL80211_CMD_PMKSA_CANDIDATE] = "pmksa_candidate",
+	[NL80211_CMD_TDLS_OPER] = "tdls_oper",
+	[NL80211_CMD_TDLS_MGMT] = "tdls_mgmt",
+	[NL80211_CMD_UNEXPECTED_FRAME] = "unexpected_frame",
+	[NL80211_CMD_PROBE_CLIENT] = "probe_client",
+	[NL80211_CMD_REGISTER_BEACONS] = "register_beacons",
+	[NL80211_CMD_UNEXPECTED_4ADDR_FRAME] = "unexpected_4addr_frame",
+	[NL80211_CMD_SET_NOACK_MAP] = "set_noack_map",
+	[NL80211_CMD_CH_SWITCH_NOTIFY] = "ch_switch_notify",
 };
 
 static char cmdbuf[100];

Modified: iw/branches/upstream/current/version.sh
URL: http://svn.debian.org/wsvn/iw/branches/upstream/current/version.sh?rev=1770&op=diff
==============================================================================
--- iw/branches/upstream/current/version.sh (original)
+++ iw/branches/upstream/current/version.sh Tue Jun 26 12:21:46 2012
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION="3.4"
+VERSION="3.5"
 OUT="$1"
 
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then




More information about the Pkg-wpa-devel mailing list