aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nl80211.h
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-04-02 14:08:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 16:54:40 -0400
commit6bad8766620a3c8b64afa981502fdb543e3cfd6c (patch)
tree7524ea7826a443d920062e48fe081e82b6fd7385 /include/linux/nl80211.h
parent5dab3b8a68cc97a7e6b9f79f5de05803c8e55a3c (diff)
cfg80211: send regulatory beacon hint events to userspace
This informs userspace when a change has occured on a world roaming wiphy's channel which has lifted some restrictions due to a regulatory beacon hint. Because this is now sent to userspace through the regulatory multicast group we remove the debug prints we used to use as they are no longer necessary. Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/nl80211.h')
-rw-r--r--include/linux/nl80211.h34
1 files changed, 33 insertions, 1 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 209cacee5285..05ba3539b77e 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -7,7 +7,7 @@
7 * Copyright 2008 Michael Wu <flamingice@sourmilk.net> 7 * Copyright 2008 Michael Wu <flamingice@sourmilk.net>
8 * Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com> 8 * Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com>
9 * Copyright 2008 Michael Buesch <mb@bu3sch.de> 9 * Copyright 2008 Michael Buesch <mb@bu3sch.de>
10 * Copyright 2008 Luis R. Rodriguez <lrodriguez@atheros.com> 10 * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
11 * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com> 11 * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
12 * Copyright 2008 Colin McCabe <colin@cozybit.com> 12 * Copyright 2008 Colin McCabe <colin@cozybit.com>
13 * 13 *
@@ -166,6 +166,22 @@
166 * set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is 166 * set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is
167 * %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on 167 * %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
168 * to (%NL80211_ATTR_REG_ALPHA2). 168 * to (%NL80211_ATTR_REG_ALPHA2).
169 * @NL80211_CMD_REG_BEACON_HINT: indicates to userspace that an AP beacon
170 * has been found while world roaming thus enabling active scan or
171 * any mode of operation that initiates TX (beacons) on a channel
172 * where we would not have been able to do either before. As an example
173 * if you are world roaming (regulatory domain set to world or if your
174 * driver is using a custom world roaming regulatory domain) and while
175 * doing a passive scan on the 5 GHz band you find an AP there (if not
176 * on a DFS channel) you will now be able to actively scan for that AP
177 * or use AP mode on your card on that same channel. Note that this will
178 * never be used for channels 1-11 on the 2 GHz band as they are always
179 * enabled world wide. This beacon hint is only sent if your device had
180 * either disabled active scanning or beaconing on a channel. We send to
181 * userspace the wiphy on which we removed a restriction from
182 * (%NL80211_ATTR_WIPHY) and the channel on which this occurred
183 * before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER)
184 * the beacon hint was processed.
169 * 185 *
170 * @NL80211_CMD_AUTHENTICATE: authentication request and notification. 186 * @NL80211_CMD_AUTHENTICATE: authentication request and notification.
171 * This command is used both as a command (request to authenticate) and 187 * This command is used both as a command (request to authenticate) and
@@ -270,6 +286,8 @@ enum nl80211_commands {
270 286
271 NL80211_CMD_MICHAEL_MIC_FAILURE, 287 NL80211_CMD_MICHAEL_MIC_FAILURE,
272 288
289 NL80211_CMD_REG_BEACON_HINT,
290
273 /* add new commands above here */ 291 /* add new commands above here */
274 292
275 /* used to define NL80211_CMD_MAX below */ 293 /* used to define NL80211_CMD_MAX below */
@@ -288,6 +306,7 @@ enum nl80211_commands {
288#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE 306#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
289#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE 307#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
290#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE 308#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
309#define NL80211_CMD_REG_BEACON_HINT NL80211_CMD_REG_BEACON_HINT
291 310
292/** 311/**
293 * enum nl80211_attrs - nl80211 netlink attributes 312 * enum nl80211_attrs - nl80211 netlink attributes
@@ -423,6 +442,17 @@ enum nl80211_commands {
423 * @NL80211_ATTR_KEY_TYPE: Key Type, see &enum nl80211_key_type, represented as 442 * @NL80211_ATTR_KEY_TYPE: Key Type, see &enum nl80211_key_type, represented as
424 * a u32 443 * a u32
425 * 444 *
445 * @NL80211_ATTR_FREQ_BEFORE: A channel which has suffered a regulatory change
446 * due to considerations from a beacon hint. This attribute reflects
447 * the state of the channel _before_ the beacon hint processing. This
448 * attributes consists of a nested attribute containing
449 * NL80211_FREQUENCY_ATTR_*
450 * @NL80211_ATTR_FREQ_AFTER: A channel which has suffered a regulatory change
451 * due to considerations from a beacon hint. This attribute reflects
452 * the state of the channel _after_ the beacon hint processing. This
453 * attributes consists of a nested attribute containing
454 * NL80211_FREQUENCY_ATTR_*
455 *
426 * @NL80211_ATTR_MAX: highest attribute number currently defined 456 * @NL80211_ATTR_MAX: highest attribute number currently defined
427 * @__NL80211_ATTR_AFTER_LAST: internal use 457 * @__NL80211_ATTR_AFTER_LAST: internal use
428 */ 458 */
@@ -511,6 +541,8 @@ enum nl80211_attrs {
511 541
512 NL80211_ATTR_MAX_SCAN_IE_LEN, 542 NL80211_ATTR_MAX_SCAN_IE_LEN,
513 543
544 NL80211_ATTR_FREQ_BEFORE,
545 NL80211_ATTR_FREQ_AFTER,
514 /* add attributes here, update the policy in nl80211.c */ 546 /* add attributes here, update the policy in nl80211.c */
515 547
516 __NL80211_ATTR_AFTER_LAST, 548 __NL80211_ATTR_AFTER_LAST,