From d818daa1f26354f96a3c75ba1f50e99d7560c395 Mon Sep 17 00:00:00 2001
From: proski <proski@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Date: Thu, 17 Jul 2008 04:50:29 +0000
Subject: [PATCH] Merge some comment changes from madwifi-dfs

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3787 0192ed92-7a03-0410-a25b-9323aeb14dbd
---
 net80211/ieee80211.c      | 12 ++++++------
 net80211/ieee80211_scan.c |  8 ++++----
 net80211/ieee80211_var.h  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c
index ad026a9..1695a04 100644
--- a/net80211/ieee80211.c
+++ b/net80211/ieee80211.c
@@ -804,12 +804,12 @@ ieee80211_media_setup(struct ieee80211com *ic,
 }
 
 /*
- * Perform the dfs action (channel switch) using scan cache or a randomly
- * chosen channel. The choice of the fallback random channel is done in
- * ieee80211_scan_dfs_action, when there are no scan cache results.
+ * Perform the DFS action (channel switch) using scan cache or a randomly
+ * chosen channel. The choice of the random channel is done in
+ * ieee80211_scan_dfs_action().
  *
- * This was moved out of ieee80211_mark_dfs, because the same functionality is
- * used also in ieee80211_ioctl_chanswitch.
+ * This was moved out of ieee80211_mark_dfs(), because the same functionality
+ * is used also in ieee80211_ioctl_chanswitch().
  */
 void
 ieee80211_dfs_action(struct ieee80211com *ic) {
@@ -1140,7 +1140,7 @@ ieee80211_dfs_test_return(struct ieee80211com *ic, u_int8_t ieeeChan)
 {
 	struct net_device *dev = ic->ic_dev;
 
-	/* Return to the original channel we were on before the test mute */
+	/* Return to the original channel we were on before the test mute. */
 	if_printf(dev, "Returning to channel %d\n", ieeeChan);
 	printk(KERN_DEBUG "Returning to chan %d\n", ieeeChan);
 	ic->ic_chanchange_chan = ieeeChan;
diff --git a/net80211/ieee80211_scan.c b/net80211/ieee80211_scan.c
index 3ab7428..4c586a5 100644
--- a/net80211/ieee80211_scan.c
+++ b/net80211/ieee80211_scan.c
@@ -291,13 +291,13 @@ scan_restart_pwrsav(unsigned long arg)
 	struct ieee80211com *ic = vap->iv_ic;
 	int delay;
 
-	/* Handle PS stuff, if required. */
 	ieee80211_sta_pwrsave(vap, 1);
-
-	/* Use an initial 1ms delay to ensure the null
+	/*
+	 * Use an initial 1ms delay to ensure the null
 	 * data frame has a chance to go out.
 	 * XXX: 1ms is a lot, better to trigger scan
-	 * on TX complete. */
+	 * on TX complete.
+	 */
 	delay = msecs_to_jiffies(1);
 	if (delay < 1)
 		delay = 1;
diff --git a/net80211/ieee80211_var.h b/net80211/ieee80211_var.h
index abf4f25..5461248 100644
--- a/net80211/ieee80211_var.h
+++ b/net80211/ieee80211_var.h
@@ -424,7 +424,7 @@ struct ieee80211com {
 	int ic_country_outdoor;
 	struct ieee80211_ie_country ic_country_ie; /* country info element */
 
-	/* current channel max power, used to compute Power Constraint IE.
+	/* Current channel max. power, used to compute Power Constraint IE.
 	 *
 	 * NB: local power constraint depends on the channel, but assuming it must
 	 *     be detected dynamically, we cannot maintain a table (i.e., will not
@@ -586,7 +586,7 @@ MALLOC_DECLARE(M_80211_VAP);
 #define IEEE80211_F_NOBRIDGE    0x10000000		/* CONF: disable internal bridge */
 
 #define	IEEE80211_F_WMEUPDATE	0x20000000		/* STATUS: update beacon wme */
-#define IEEE80211_F_DOTH	0x40000000		/* enable 11.h */
+#define IEEE80211_F_DOTH	0x40000000		/* CONF: enable 11.h (dot11SpectrumManagementRequired) */
 #define IEEE80211_F_CHANSWITCH	0x80000000		/* force chanswitch */
 
 /* ic_flags_ext */