From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 7 Jan 2009 20:58:47 +0000 (+0100)
Subject: Merge branch 'master' into scan-test
X-Git-Tag: v0.9.10~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6936a1091c5c775d07ee815a44abbdc29cd4518d;p=thirdparty%2Fiw.git

Merge branch 'master' into scan-test
---

6936a1091c5c775d07ee815a44abbdc29cd4518d
diff --cc Makefile
index 4a94964,2c629fe..f57d04c
--- a/Makefile
+++ b/Makefile
@@@ -10,14 -10,28 +10,28 @@@ MKDIR ?= mkdir -
  INSTALL ?= install
  CC ?= "gcc"
  
- CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration `pkg-config --cflags libnl-1`
- CFLAGS += -O2 -g
- LDFLAGS += `pkg-config --libs libnl-1`
- NLVERSION = 1.0
+ CFLAGS ?= -O2 -g
+ CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
  
 -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
  
+ NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)
+ NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y)
+ 
+ ifeq ($(NL1FOUND),Y)
+ NLLIBNAME = libnl-1
+ endif
+ 
+ ifeq ($(NL2FOUND),Y)
+ CFLAGS += -DCONFIG_LIBNL20
+ LIBS += -lnl-genl
+ NLLIBNAME = libnl-2.0
+ endif
+ 
+ LIBS += $(shell pkg-config --libs $(NLLIBNAME))
+ CFLAGS += $(shell pkg-config --cflags $(NLLIBNAME))
+ 
  ifeq ($(V),1)
  Q=
  NQ=true
diff --cc nl80211.h
index 1f60a24,e86ed59..ea16da7
--- a/nl80211.h
+++ b/nl80211.h
@@@ -360,15 -344,8 +360,15 @@@ enum nl80211_attrs 
  
  	NL80211_ATTR_WIPHY_TXQ_PARAMS,
  	NL80211_ATTR_WIPHY_FREQ,
- 	NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
+ 	NL80211_ATTR_WIPHY_CHANNEL_TYPE,
  
 +	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,
@@@ -797,25 -805,10 +828,25 @@@ enum nl80211_txq_q 
  	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_channel_type {
+ 	NL80211_CHAN_NO_HT,
+ 	NL80211_CHAN_HT20,
+ 	NL80211_CHAN_HT40MINUS,
+ 	NL80211_CHAN_HT40PLUS
  };
 +
 +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 */