diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-04 08:58:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-04 08:58:14 -0800 |
| commit | 10be7eb36b93364b98688831ee7d26f58402bb96 (patch) | |
| tree | eb13ae80fcaa8baacd804a721c5a4962a501a2a4 /include/net/regulatory.h | |
| parent | 90c30335a70e96b8b8493b7deb15e6b30e6d9fce (diff) | |
| parent | 5ffaf8a361b4c9025963959a744f21d8173c7669 (diff) | |
| download | linux-3.10-10be7eb36b93364b98688831ee7d26f58402bb96.tar.gz linux-3.10-10be7eb36b93364b98688831ee7d26f58402bb96.tar.bz2 linux-3.10-10be7eb36b93364b98688831ee7d26f58402bb96.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/net/regulatory.h')
| -rw-r--r-- | include/net/regulatory.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/regulatory.h b/include/net/regulatory.h index 47995b81c5d..f873ee37f7e 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -39,6 +39,7 @@ enum environment_cap { * 00 - World regulatory domain * 99 - built by driver but a specific alpha2 cannot be determined * 98 - result of an intersection between two regulatory domains + * 97 - regulatory domain has not yet been configured * @intersect: indicates whether the wireless core should intersect * the requested regulatory domain with the presently set regulatory * domain. |