[Madwifi-cvs] revision 3528 committed

[Benoit P. <svn...@ma...>]

Project     : madwifi
Revision    : 3528
Author      : benoit (Benoit Papillault)
Date        : 2008-04-10 18:44:49 +0200 (Thu, 10 Apr 2008)

Log Message :
Display the end of the non-occupancy period, if applicable

Affected Files:
* madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c  updated             


Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c	2008-04-10 16:44:16 UTC (rev 3527)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c	2008-04-10 16:44:49 UTC (rev 3528)
@@ -433,6 +433,7 @@
 	char *p = buf;
 	struct ieee80211_channel *channel;
 	int i;
+	char str[50];
 
 	for (i = 0; i < ic->ic_nchans; i++) {
 
@@ -442,17 +443,24 @@
 
 		channel = &ic->ic_channels[i];
 
-		p += sprintf(p, "Channel %3d (%4d Mhz) : %s %s%s%s\n",
-			     channel->ic_ieee,
-			     channel->ic_freq,
-			     IEEE80211_IS_CHAN_PASSIVE(channel) ?
-			     "  Dfs" : "NoDfs",
-			     IEEE80211_IS_CHAN_RADAR(channel) ?
-			     "  Radar" : "NoRadar",
-			     IEEE80211_IS_CHAN_INDOOR(channel) ?
-			     " Indoor" : "",
-			     IEEE80211_IS_CHAN_OUTDOOR(channel) ?
-			     " Outdoor" : "");
+		if ((ic->ic_chan_non_occupy[i].tv_sec == 0) &&
+		    (ic->ic_chan_non_occupy[i].tv_usec) == 0) {
+			str[0] = 0; /* empty string */
+		} else {
+			sprintf(str, " End: %ld.%06ld",
+				ic->ic_chan_non_occupy[i].tv_sec,
+				ic->ic_chan_non_occupy[i].tv_usec);
+		}
+
+		p += sprintf(p,
+			"Channel %3d (%4d Mhz) : %s %s%s%s%s\n",
+			channel->ic_ieee,
+			channel->ic_freq,
+			IEEE80211_IS_CHAN_PASSIVE(channel) ? "  Dfs":"NoDfs",
+			IEEE80211_IS_CHAN_RADAR(channel) ? "  Radar":"NoRadar",
+			IEEE80211_IS_CHAN_INDOOR(channel) ? " Indoor" : "",
+			IEEE80211_IS_CHAN_OUTDOOR(channel) ?  " Outdoor" : "",
+			str);
         }
 	return (p - buf);
 }