From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 5 Feb 2009 20:08:54 +0000 (+0100)
Subject: Merge branch 'master' into scan-test
X-Git-Tag: v0.9.10~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50563c6af47ce7abda6c7b23f57f86114a521662;p=thirdparty%2Fiw.git

Merge branch 'master' into scan-test

Conflicts:
	nl80211.h
---

50563c6af47ce7abda6c7b23f57f86114a521662
diff --cc nl80211.h
index 1f9a927,4bc2704..8802d1b
--- a/nl80211.h
+++ b/nl80211.h
@@@ -195,11 -190,8 +197,13 @@@ enum nl80211_commands 
  
  	NL80211_CMD_SET_MGMT_EXTRA_IE,
  
+ 	NL80211_CMD_GET_REG,
+ 
 +	NL80211_CMD_GET_SCAN,
 +	NL80211_CMD_TRIGGER_SCAN,
 +	NL80211_CMD_NEW_SCAN_RESULTS,
 +	NL80211_CMD_SCAN_ABORTED,
 +
  	/* add new commands above here */
  
  	/* used to define NL80211_CMD_MAX below */