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 c99d96a36d6f44ec3a07eb76c27986d26086904d..ca15575d86350d658a77dbddc2dd41e4005e1f55 100644 (file)
--- 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 caba1b40d02785099afa16f6981cd6444f8c90aa..5c4f59323135a21929ed2d5bbe540a07edc0aceb 100644 (file)
--- 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 b7f3a45f7cf0ffca7631fa9684b108b489f5889f..64e01ff1f21940824da1499f6e42b642cddda2a0 100644 (file)
--- 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 */