From: mtaylor <mtaylor@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Date: Fri, 18 Jan 2008 21:25:05 +0000 (+0000)
Subject: Move channel non-occupancy limits out of ieee80211_channel structure to
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=278c57c4e70aac424b34ff476d5d21620e2aa5d1;p=madwifi%2F.git

Move channel non-occupancy limits out of ieee80211_channel structure to
avoid hitting the size limitations of wireless extensions.  wext is a real pain.
Now the values are stored in ic_chan_non_occupy[] instead.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3207 0192ed92-7a03-0410-a25b-9323aeb14dbd
---

diff --git a/ath/if_ath.c b/ath/if_ath.c
index c99d96a..ca15575 100644
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -9334,8 +9334,8 @@ ath_getchannels(struct net_device *dev, u_int cc,
 		ichan->ic_maxregpower	= c->maxRegTxPower;	/* dBm */
 		ichan->ic_maxpower	= c->maxTxPower;	/* 1/2 dBm */
 		ichan->ic_minpower	= c->minTxPower;	/* 1/2 dBm */
-		ichan->ic_non_occupancy_period.tv_sec  = 0;
-		ichan->ic_non_occupancy_period.tv_usec = 0;
+		ic->ic_chan_non_occupy[i].tv_sec  = 0;
+		ic->ic_chan_non_occupy[i].tv_usec = 0;
 
 		printk(KERN_INFO "Channel %3d (%4d MHz) Max Tx Power %d dBm%s "
 				"[%d hw %d reg] Flags%s%s%s%s%s%s%s%s%s%s%s%s%"
diff --git a/net80211/_ieee80211.h b/net80211/_ieee80211.h
index caba1b4..5c4f593 100644
--- a/net80211/_ieee80211.h
+++ b/net80211/_ieee80211.h
@@ -142,11 +142,6 @@ struct ieee80211_channel {
 	int8_t ic_maxregpower;	/* maximum regulatory tx power in dBm */
 	int8_t ic_maxpower;	/* maximum tx power in dBm */
 	int8_t ic_minpower;	/* minimum tx power in dBm */
-
-	/* end of the Non-Occupancy Period, when we can use this channel again?
-	 * If <= NOW then clear IEEE80211_CHAN_RADAR in ic_flags. Initialized
-	 * to {0,0} */
-	struct timeval ic_non_occupancy_period;
 };
 
 #define	IEEE80211_CHAN_MAX	255
diff --git a/net80211/ieee80211_var.h b/net80211/ieee80211_var.h
index b7f3a45..64e01ff 100644
--- a/net80211/ieee80211_var.h
+++ b/net80211/ieee80211_var.h
@@ -319,6 +319,7 @@ struct ieee80211com {
 	 */
 	int ic_nchans;				/* # entries in ic_channels */
 	struct ieee80211_channel ic_channels[IEEE80211_CHAN_MAX+1];
+	struct timeval ic_chan_non_occupy[IEEE80211_CHAN_MAX];
 	u_int8_t ic_chan_avail[IEEE80211_CHAN_BYTES];
 	u_int8_t ic_chan_active[IEEE80211_CHAN_BYTES];
 	struct ieee80211_channel *ic_curchan;	/* current channel */