Changeset 112

Timestamp:

04/30/03 18:40:22 (9 years ago)

Author:

sam

Message:

updates from freebsd:

o track hal api changes for 32/64 bit tsf
o track wlan api changes for passing recv antenna state
o handle short/long preamble and set xmit antenna state in driver
o record tx antenna state in private node state
o fix rate control algorithm retry statistics to match algorithm expectations
o use a dynamically allocate channel array when querying the hal for the

available channel set so 5212 cards can return all their channels (fixed
size array was too small)

o track hal api change for ath_hal_getratetable

Files:

• cvs-import/trunk/driver/if_ath.c (modified) (22 diffs)
• cvs-import/trunk/driver/if_athvar.h (modified) (3 diffs)

cvs-import/trunk/driver/if_ath.c

@@ -400 +400 @@
-        u_int32_t val;
-        HAL_STATUS status;
+        int i;
-
-        DPRINTF(("ath_init\n"));
@@ -455 +456 @@
-         * immediately call back to us to send mgmt frames.
-         */
+        ni = &ic->ic_bss;
+        ieee80211_set_node(ic, ni, ic->ic_ibss_chan);
-        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
-                int i;
-                ni->ni_chan = ic->ic_ibss_chan;
-                ni->ni_intval = ic->ic_lintval;
-                ni->ni_rssi = 0;
-                ni->ni_rstamp = 0;
+                ni->ni_rantenna = 0;
-                memset(ni->ni_tstamp, 0, sizeof(ni->ni_tstamp));
-                ni->ni_nrate = 0;
@@ -479 +482 @@
-                ieee80211_new_state(dev, IEEE80211_S_RUN, -1);
-        } else {
-                ni->ni_chan = ic->ic_ibss_chan;
-                ieee80211_new_state(dev, IEEE80211_S_SCAN, -1);
-        }
@@ -698 +700 @@
-                u_int32_t *tstamp;
-
-
+64
-                /* XXX: adjust 100us delay to xmit */
-                tsf += 100;
@@ -1265 +1267 @@
-                stats->rx_packets++;
-                stats->rx_bytes += len;
-
-
+
+
+
+
-  rx_next:
-                TAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
@@ -1294 +1298 @@
-        u_int8_t hdrbuf[sizeof(struct ieee80211_frame) +
-            IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN];
-
+, antenna
-        HAL_PKT_TYPE atype;
-        const HAL_RATE_TABLE *rt;
+        HAL_BOOL shortPreamble;
+        struct ath_nodestat *st;
-
-        wh = (struct ieee80211_frame *) skb->data;
@@ -1343 +1349 @@
-        bf->bf_node = ni;
-
+        /* setup descriptors */
-        ds = bf->bf_desc;
-        rt = sc->sc_rates[ni->ni_mode];
@@ -1373 +1380 @@
-                 */
-                txrate = ni->ni_rates[ni->ni_txrate];
+                /* XXX use table lookup */
-                for (rix = 0; rix < rt->rateCount; rix++)
-                        if (txrate == rt->info[rix].dot11Rate)
-                                break;
+                /* XXX verify valid rate */
-                break;
-        }
@@ -1381 +1390 @@
-                /* 11g always uses long preamble */
-                txrate = rt->info[rix].rateCode;
-
+
+
+
+
+
-        } else {
-                /* XXX no control over long/short preamble */
-                txrate = rt->info[rix].rateCode | rt->info[rix].shortPreamble;
-flags |= HAL_TXDESC_SHORTPR
+shortPreamble = AH_TRU
-        }
-
@@ -1403 +1416 @@
-                if (flags & HAL_TXDESC_RTSENA) {        /* SIFS + CTS */
-                        ctsduration += ath_hal_computetxtime(ah,
-
-
+
-                }
-                /* SIFS + data */
-                ctsduration += ath_hal_computetxtime(ah, rt, pktlen,
-(flags & HAL_TXDESC_SHORTPRE) != 0
+shortPreamble
-                if ((flags & HAL_TXDESC_NOACK) == 0) {  /* SIFS + ACK */
-                        ctsduration += ath_hal_computetxtime(ah,
-
-
+
-                }
-        } else
-                ctsrate = 0;
+
+        /*
+         * For now use the antenna on which the last good
+         * frame was received on.  We assume this field is
+         * initialized to 0 which gives us ``auto'' or the
+         * ``default'' antenna.
+         */
+        st = ni->ni_private;
+        if (st->st_tx_antenna)
+                antenna = st->st_tx_antenna;
+        else
+                antenna = ni->ni_rantenna;
-
-        /*
@@ -1427 +1450 @@
-                , txrate, 1+10          /* series 0 rate/tries */
-                , iswep ? sc->sc_ic.ic_wep_txkey : HAL_TXKEYIX_INVALID
-0    
+antenna
-                , flags                 /* flags */
-                , ctsrate               /* rts/cts rate */
@@ -1482 +1505 @@
-        struct ath_buf *bf;
-        struct ath_desc *ds;
+        struct ieee80211_node *ni;
-        struct ath_nodestat *st;
-        int sr, lr;
@@ -1510 +1534 @@
-                spin_unlock(&sc->sc_txqlock);
-
-
-
-
+
+
+
+
-                                st->st_tx_ok++;
-
+
+
-                                st->st_tx_err++;
-                                if (ds->ds_txstat.ts_status & HAL_TXERR_XRETRY)
@@ -1522 +1548 @@
-                                if (ds->ds_txstat.ts_status & HAL_TXERR_FILT)
-                                        sc->sc_stats.ast_tx_filtered++;
+                                st->st_tx_antenna = 0;  /* invalidate */
-                        }
-                        sr = ds->ds_txstat.ts_shortretry;
@@ -1527 +1554 @@
-                        sc->sc_stats.ast_tx_shortretry += sr;
-                        sc->sc_stats.ast_tx_longretry += lr;
-
+
+
-                }
-                pci_unmap_single(sc->sc_pdev,
@@ -1776 +1804 @@
-        struct ath_hal *ah = sc->sc_ah;
-        struct ieee80211com *ic = &sc->sc_ic;
- = &ic->ic_bss;       /* NB: no reference */
+;
-        struct ath_nodestat *st;
-        int i, error;
@@ -1795 +1823 @@
-
-        ostate = ic->ic_state;
-
+32
-
-        DPRINTF(("ath_newstate: %s -> %s (%u)\n",
@@ -1807 +1835 @@
-                goto bad;
-        }
+        ni = &ic->ic_bss;
-        error = ath_chan_set(sc, ni->ni_chan);
-        if (error != 0)
@@ -1884 +1913 @@
-        del_timer(&sc->sc_cal_ch);
-        return error;
+}
+
+static int
+ath_getchannels(struct net_device *dev, u_int cc, HAL_BOOL outdoor)
+{
+        struct ath_softc *sc = dev->priv;
+        struct ieee80211com *ic = &sc->sc_ic;
+        struct ath_hal *ah = sc->sc_ah;
+        HAL_CHANNEL *chans;
+        int i, ix, nchan;
+
+        chans = kmalloc(IEEE80211_CHAN_MAX * sizeof(HAL_CHANNEL), GFP_KERNEL);
+        if (chans == NULL) {
+                printk("%s: unable to allocate channel table\n", dev->name);
+                return ENOMEM;
+        }
+        /* XXX where does the country code, et. al. come from? */
+        if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan,
+            CTRY_DEFAULT, HAL_MODE_ALL, AH_TRUE)) {
+                printk("%s: unable to collect channel list from hal\n",
+                        dev->name);
+                kfree(chans);
+                return EINVAL;
+        }
+
+        /*
+         * Convert HAL channels to ieee80211 ones and insert
+         * them in the table according to their channel number.
+         */
+        for (i = 0; i < nchan; i++) {
+                HAL_CHANNEL *c = &chans[i];
+                ix = ath_hal_mhz2ieee(c->channel, c->channelFlags);
+                if (ix > IEEE80211_CHAN_MAX) {
+                        printk("%s: bad hal channel %u (%u/%x) ignored\n",
+                                dev->name, ix, c->channel, c->channelFlags);
+                        continue;
+                }
+                /* NB: flags are known to be compatible */
+                if (ic->ic_channels[ix].ic_freq == 0) {
+                        ic->ic_channels[ix].ic_freq = c->channel;
+                        ic->ic_channels[ix].ic_flags = c->channelFlags;
+                } else {
+#ifdef notdef
+                        /* XXX 802.11 code can't handle this right now */
+                        /* channels overlap; e.g. 11g and 11a/b */
+                        ic->ic_channels[ix].ic_flags |= c->channelFlags;
+#endif
+                }
+        }
+        kfree(chans);
+        return 0;
-}
-
@@ -1913 +1993 @@
-                return 0;
-        }
-        r = ic->ic_sup_rates[mode];
-        rt = sc->sc_rates[mode];
+        if (rt == NULL)
+                return 0;
-        if (rt->rateCount > IEEE80211_RATE_SIZE) {
-                DPRINTF(("%s: rate table too small (%u > %u)\n",
@@ -1921 +2002 @@
-        } else
-                maxrates = rt->rateCount;
+        r = ic->ic_sup_rates[mode];
-        /* XXX must mark basic rates for 11g */
-        for (i = 0; i < maxrates; i++)
@@ -2063 +2145 @@
-}
-
-static int
-ath_getchannels(struct net_device *dev, u_int cc, HAL_BOOL outdoor)
-{
-        struct ath_softc *sc = dev->priv;
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct ath_hal *ah = sc->sc_ah;
-#define ATH_MAXCHAN     32              /* number of potential channels */
-        HAL_CHANNEL chans[ATH_MAXCHAN]; /* XXX get off stack */
-        int i, ix, nchan;
-
-        /* XXX where does the country code, et. al. come from? */
-        if (!ath_hal_init_channels(ah, chans, ATH_MAXCHAN, &nchan,
-            CTRY_DEFAULT, HAL_MODE_ALL, AH_TRUE)) {
-                printk("%s: unable to collect channel list from hal\n",
-                        dev->name);
-                return EINVAL;
-        }
-
-        /*
-         * Convert HAL channels to ieee80211 ones and insert
-         * them in the table according to their channel number.
-         */
-        for (i = 0; i < nchan; i++) {
-                HAL_CHANNEL *c = &chans[i];
-                ix = ath_hal_mhz2ieee(c->channel, c->channelFlags);
-                if (ix > IEEE80211_CHAN_MAX) {
-                        printk("%s: bad hal channel %u (%u/%x) ignored\n",
-                                dev->name, ix, c->channel, c->channelFlags);
-                        continue;
-                }
-                /* NB: flags are known to be compatible */
-                if (ic->ic_channels[ix].ic_freq == 0) {
-                        ic->ic_channels[ix].ic_freq = c->channel;
-                        ic->ic_channels[ix].ic_flags = c->channelFlags;
-                } else {
-#ifdef notdef
-                        /* XXX 802.11 code can't handle this right now */
-                        /* channels overlap; e.g. 11g and 11a/b */
-                        ic->ic_channels[ix].ic_flags |= c->channelFlags;
-#endif
-                }
-        }
-        return 0;
-}
-
-#ifdef CONFIG_PROC_FS
-#include <linux/proc_fs.h>

cvs-import/trunk/driver/if_athvar.h

@@ -48 +48 @@
-        u_int           st_tx_retr;     /* tx retry count */
-        int             st_tx_upper;    /* tx upper rate req cnt */
+        u_int           st_tx_antenna;  /* antenna for last good frame */
-};
-
@@ -160 +161 @@
-#define ath_hal_reset(_ah, _opmode, _chan, _outdoor, _pstatus) \
-        ((*(_ah)->ah_reset)((_ah), (_opmode), (_chan), (_outdoor), (_pstatus)))
+#define ath_hal_getratetable(_ah, _mode) \
+        ((*(_ah)->ah_getRateTable)((_ah), (_mode)))
-#define ath_hal_getmac(_ah, _mac) \
-        ((*(_ah)->ah_getMacAddress)((_ah), (_mac)))
@@ -194 +197 @@
-#define ath_hal_putrxbuf(_ah, _bufaddr) \
-        ((*(_ah)->ah_setRxDP)((_ah), (_bufaddr)))
-
-
+
+
+
+
-#define ath_hal_rxena(_ah) \
-        ((*(_ah)->ah_enableReceive)((_ah)))