Merge branch 'master' into scan-test

Conflicts:
	Makefile
	nl80211.h

diff --cc Makefile
index 0f3d427fb7e72f3b68faa6773097c6e3f9dd5c94,df59b5101cacbdd3a771a0a4d198051b781b0c4a..4a949643f767d36ddc02956157e89a530d17a37f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -11,7 -15,7 +15,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 mesh.o scan.o
 -OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o genl.o
++OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o genl.o scan.o
  ALL = iw
  
  ifeq ($(V),1)

diff --cc info.c
Simple merge

diff --cc nl80211.h
index 2929d46033487874bb5e5afdb5ce2de0b64578e5,04d4516f9c712e91f4aaf541015c93d61abd9b25..1f60a24ea4dd1b9f7ab60318bcfee5403057f2e8
--- 1/nl80211.h
--- 2/nl80211.h
+++ b/nl80211.h
@@@ -323,13 -340,12 +356,19 @@@ enum nl80211_attrs 
  
        NL80211_ATTR_MESH_PARAMS,
  
+       NL80211_ATTR_BSS_BASIC_RATES,
+ 
+       NL80211_ATTR_WIPHY_TXQ_PARAMS,
+       NL80211_ATTR_WIPHY_FREQ,
+       NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
+ 
 +      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,
@@@ -715,18 -740,44 +763,59 @@@ enum nl80211_meshconf_params 
        NL80211_MESHCONF_ATTR_MAX = __NL80211_MESHCONF_ATTR_AFTER_LAST - 1
  };
  
+ /**
+  * 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_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
+  *    disabled
+  * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
+  *    2^n-1 in the range 1..32767]
+  * @NL80211_TXQ_ATTR_CWMAX: Maximum contention window [a value of the form
+  *    2^n-1 in the range 1..32767]
+  * @NL80211_TXQ_ATTR_AIFS: Arbitration interframe space [0..255]
+  * @__NL80211_TXQ_ATTR_AFTER_LAST: Internal
+  * @NL80211_TXQ_ATTR_MAX: Maximum TXQ attribute number
+  */
+ enum nl80211_txq_attr {
+       __NL80211_TXQ_ATTR_INVALID,
+       NL80211_TXQ_ATTR_QUEUE,
+       NL80211_TXQ_ATTR_TXOP,
+       NL80211_TXQ_ATTR_CWMIN,
+       NL80211_TXQ_ATTR_CWMAX,
+       NL80211_TXQ_ATTR_AIFS,
+ 
+       /* keep last */
+       __NL80211_TXQ_ATTR_AFTER_LAST,
+       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_sec_chan_offset {
+       NL80211_SEC_CHAN_NO_HT /* No HT */,
+       NL80211_SEC_CHAN_DISABLED /* HT20 only */,
+       NL80211_SEC_CHAN_BELOW /* HT40- */,
+       NL80211_SEC_CHAN_ABOVE /* HT40+ */
+ };
++
 +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 */