From 5d24f8b5dcc0f13fba0ece06277954b52beae18c Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 30 May 2006 11:55:42 -0500
Subject: [PATCH] --- yaml --- r: 28815 b: refs/heads/master c:
 74f4903363579d3336c294ebb11f02c8f35845ca h: refs/heads/master i:   28813:
 304cd7cca0522df6d63bfd193dd8b31ec68412a6   28811:
 560d6fc0ea5f4ea9c8ceb7aa86af098a3f50fb04   28807:
 17da13ca092024f045a4308e05798699a69f6865   28799:
 e6a32ea88dd3580e80561ad0221225d062c59312 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/ieee80211.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 98dcf23139f5..b137af051edf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76df73ff90e99681a99e457aec4cfe0a240b7982
+refs/heads/master: 74f4903363579d3336c294ebb11f02c8f35845ca
diff --git a/trunk/include/net/ieee80211.h b/trunk/include/net/ieee80211.h
index d5147770ad47..ecc42864b001 100644
--- a/trunk/include/net/ieee80211.h
+++ b/trunk/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 {