summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-20 12:46:02 +0400
committerJeff Garzik <jeff@garzik.org>2006-06-20 12:46:02 +0400
commit4b2d9cf00962d0a0e697f887f3ecaa155cbde555 (patch)
tree3a64ad0825e82c3df0b4d84c412c647c19e34afb /include/net
parent4c1234ff24dd8dc2d9020d6315d91a71339be114 (diff)
parent89c318ed3985da1271e00ad586f2dce8a6e75656 (diff)
downloadlinux-4b2d9cf00962d0a0e697f887f3ecaa155cbde555.tar.xz
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ieee80211.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index d5147770ad47..ecc42864b001 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -968,6 +968,7 @@ enum ieee80211_state {
enum {
IEEE80211_CH_PASSIVE_ONLY = (1 << 0),
+ IEEE80211_CH_80211H_RULES = (1 << 1),
IEEE80211_CH_B_ONLY = (1 << 2),
IEEE80211_CH_NO_IBSS = (1 << 3),
IEEE80211_CH_UNIFORM_SPREADING = (1 << 4),
@@ -976,10 +977,10 @@ enum {
};
struct ieee80211_channel {
- u32 freq;
+ u32 freq; /* in MHz */
u8 channel;
u8 flags;
- u8 max_power;
+ u8 max_power; /* in dBm */
};
struct ieee80211_geo {