Merge branch 'master' into scan-test

Conflicts:

	Makefile

diff --cc Makefile
index 65871c8137fb02c9adeadc2ab625a5587ef463a5,6a9010e045a1abcc044a6b332c565cce9099f33a..0f3d427fb7e72f3b68faa6773097c6e3f9dd5c94
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -11,7 -11,7 +11,7 @@@ CFLAGS += -O2 -
  LDFLAGS += `pkg-config --libs libnl-1`
  NLVERSION = 1.0
  
- OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o scan.o
 -OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o
++OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o scan.o
  ALL = iw
  
  ifeq ($(V),1)

diff --cc nl80211.h
index 1470e452075a2281cfd8fa5dbfbd41cbdb36a92f,e4cc7869b22f0b2ebf76a023dd6ca20c20b4c398..2929d46033487874bb5e5afdb5ce2de0b64578e5
--- 1/nl80211.h
--- 2/nl80211.h
+++ b/nl80211.h
@@@ -106,11 -106,12 +106,17 @@@
   *    to the the specified ISO/IEC 3166-1 alpha2 country code. The core will
   *    store this as a valid request and then query userspace for it.
   *
+  * @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the
+  *    interface identified by %NL80211_ATTR_IFINDEX
+  *
+  * @NL80211_CMD_SET_MESH_PARAMS: Set mesh networking properties for the
+  *      interface identified by %NL80211_ATTR_IFINDEX
+  *
 + * @NL80211_CMD_GET_SCAN: get scan results
 + * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
 + * @NL80211_CMD_NEW_SCAN: scan notification (as a reply to NL80211_CMD_GET_SCAN
 + *    and on the "scan" multicast group)
 + *
   * @NL80211_CMD_MAX: highest used command number
   * @__NL80211_CMD_AFTER_LAST: internal use
   */
@@@ -153,10 -154,9 +159,13 @@@ enum nl80211_commands 
        NL80211_CMD_SET_REG,
        NL80211_CMD_REQ_SET_REG,
  
+       NL80211_CMD_GET_MESH_PARAMS,
+       NL80211_CMD_SET_MESH_PARAMS,
+ 
 +      NL80211_CMD_GET_SCAN,
 +      NL80211_CMD_TRIGGER_SCAN,
 +      NL80211_CMD_NEW_SCAN,
 +
        /* add new commands above here */
  
        /* used to define NL80211_CMD_MAX below */
@@@ -312,13 -305,8 +321,15 @@@ enum nl80211_attrs 
        NL80211_ATTR_REG_ALPHA2,
        NL80211_ATTR_REG_RULES,
  
+       NL80211_ATTR_MESH_PARAMS,
+ 
 +      NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
 +
 +      NL80211_ATTR_SCAN_FREQUENCIES,
 +      NL80211_ATTR_SCAN_SSIDS,
 +      NL80211_ATTR_SCAN_GENERATION,
 +      NL80211_ATTR_BSS,
 +
        /* add attributes here, update the policy in nl80211.c */
  
        __NL80211_ATTR_AFTER_LAST,
@@@ -629,18 -617,79 +640,93 @@@ enum nl80211_mntr_flags 
        NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1
  };
  
+ /**
+  * enum nl80211_meshconf_params - mesh configuration parameters
+  *
+  * Mesh configuration parameters
+  *
+  * @__NL80211_MESHCONF_INVALID: internal use
+  *
+  * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
+  * millisecond units, used by the Peer Link Open message
+  *
+  * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the inital confirm timeout, in
+  * millisecond units, used by the peer link management to close a peer link
+  *
+  * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
+  * millisecond units
+  *
+  * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
+  * on this mesh interface
+  *
+  * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
+  * open retries that can be sent to establish a new peer link instance in a
+  * mesh
+  *
+  * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
+  * point.
+  *
+  * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
+  * open peer links when we detect compatible mesh peers.
+  *
+  * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
+  * containing a PREQ that an MP can send to a particular destination (path
+  * target)
+  *
+  * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
+  * (in milliseconds)
+  *
+  * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
+  * until giving up on a path discovery (in milliseconds)
+  *
+  * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
+  * points receiving a PREQ shall consider the forwarding information from the
+  * root to be valid. (TU = time unit)
+  *
+  * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
+  * TUs) during which an MP can send only one action frame containing a PREQ
+  * reference element
+  *
+  * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
+  * that it takes for an HWMP information element to propagate across the mesh
+  *
+  * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
+  *
+  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
+  */
+ enum nl80211_meshconf_params {
+       __NL80211_MESHCONF_INVALID,
+       NL80211_MESHCONF_RETRY_TIMEOUT,
+       NL80211_MESHCONF_CONFIRM_TIMEOUT,
+       NL80211_MESHCONF_HOLDING_TIMEOUT,
+       NL80211_MESHCONF_MAX_PEER_LINKS,
+       NL80211_MESHCONF_MAX_RETRIES,
+       NL80211_MESHCONF_TTL,
+       NL80211_MESHCONF_AUTO_OPEN_PLINKS,
+       NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
+       NL80211_MESHCONF_PATH_REFRESH_TIME,
+       NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
+       NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
+       NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
+       NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+ 
+       /* keep last */
+       __NL80211_MESHCONF_ATTR_AFTER_LAST,
+       NL80211_MESHCONF_ATTR_MAX = __NL80211_MESHCONF_ATTR_AFTER_LAST - 1
+ };
+ 
 +enum nl80211_bss {
 +      __NL80211_BSS_INVALID,
 +      NL80211_BSS_BSSID,
 +      NL80211_BSS_FREQUENCY,
 +      NL80211_BSS_TSF,
 +      NL80211_BSS_BEACON_INTERVAL,
 +      NL80211_BSS_CAPABILITY,
 +      NL80211_BSS_INFORMATION_ELEMENTS,
 +
 +      /* keep last */
 +      __NL80211_BSS_AFTER_LAST,
 +      NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
 +};
 +
  #endif /* __LINUX_NL80211_H */