Subject: revision 3787 committed
Newsgroups: gmane.linux.drivers.madwifi.cvs
Date: 2008-07-17 04:50:29 GMT (18 weeks, 3 days, 8 hours and 22 minutes ago)
Project : madwifi
Revision : 3787
Author : proski (Pavel Roskin)
Date : 2008-07-17 06:50:29 +0200 (Thu, 17 Jul 2008)
Log Message :
Merge some comment changes from madwifi-dfs
Affected Files:
* madwifi/trunk/net80211/ieee80211.c updated
* madwifi/trunk/net80211/ieee80211_scan.c updated
* madwifi/trunk/net80211/ieee80211_var.h updated
Modified: madwifi/trunk/net80211/ieee80211.c
===================================================================
--- madwifi/trunk/net80211/ieee80211.c 2008-07-17 04:38:23 UTC (rev 3786)
+++ madwifi/trunk/net80211/ieee80211.c 2008-07-17 04:50:29 UTC (rev 3787)
@@ -804,12 +804,12 @@
}
/*
- * 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 @@
{
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;
Modified: madwifi/trunk/net80211/ieee80211_scan.c
===================================================================
--- madwifi/trunk/net80211/ieee80211_scan.c 2008-07-17 04:38:23 UTC (rev 3786)
+++ madwifi/trunk/net80211/ieee80211_scan.c 2008-07-17 04:50:29 UTC (rev 3787)
@@ -291,13 +291,13 @@
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;
Modified: madwifi/trunk/net80211/ieee80211_var.h
===================================================================
--- madwifi/trunk/net80211/ieee80211_var.h 2008-07-17 04:38:23 UTC (rev 3786)
+++ madwifi/trunk/net80211/ieee80211_var.h 2008-07-17 04:50:29 UTC (rev 3787)
@@ -424,7 +424,7 @@
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 @@
#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 */
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/