Changeset 139

Timestamp:

05/13/03 06:32:01 (9 years ago)

Author:

sam

Message:

o move xmit rate setup from the 802.11 layer to the driver so we can do

something more intelligent later

o correct logic for reseting the h/w when getrfgain indicates new values are

needed

o add rate control and periodic calibration statistics

Files:

• cvs-import/trunk/driver/if_ath.c (modified) (12 diffs)
• cvs-import/trunk/driver/if_athvar.h (modified) (1 diff)

cvs-import/trunk/driver/if_ath.c

@@ -91 +91 @@
-static int      ath_rate_setup(struct net_device *, u_int mode);
-static void     ath_rate_mapsetup(struct net_device *);
-
+, enum ieee80211_state
-static void     ath_rate_ctl(void *, struct ieee80211_node *);
-
@@ -1825 +1825 @@
-        HAL_CHANNEL hchan;
-
+        sc->sc_stats.ast_per_cal++;
+
-        /*
-         * Convert to a HAL channel description with the flags
@@ -1837 +1839 @@
-        if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) {
-                HAL_STATUS status;
+
+                sc->sc_stats.ast_per_rfgain++;
-                /*
-                 * Rfgain is out of bounds, reset the chip
-                 * to load new gain values.
-                 */
-printk("%s: gain values need update, reset channel\n", dev->name);/*XXX*/
-                ath_hal_intrset(ah, 0);         /* disable interrupts */
-
-
-
-
+
+
+
+
+
-                        printk("%s: unable to reset hardware; hal status %u\n",
-                                dev->name, status);
-
-
-
-
+
+
-                        printk("%s: unable to start recv logic\n", dev->name);
-ath_hal_intrset(ah, sc->sc_imask);
+netif_start_queue(dev);                /* restart xmit */
-        }
-        if (!ath_hal_calibrate(ah, &hchan))
@@ -1892 +1894 @@
-        DPRINTF(("%s: %s -> %s\n", __func__, stname[ostate], stname[nstate]));
-
-
+       
-        netif_stop_queue(dev);                  /* before we do anything else */
-
@@ -2051 +2053 @@
-         * Reset the rate control state.
-         */
-
+, nstate
-        return 0;
-bad:
@@ -2168 +2170 @@
-}
-
+/*
+ * Reset the rate control state for each 802.11 state transition.
+ */
-static void
-
+, enum ieee80211_state state
-{
-        struct ieee80211com *ic = &sc->sc_ic;
@@ -2177 +2182 @@
-        st = &sc->sc_bss_stat;
-        st->st_tx_ok = st->st_tx_err = st->st_tx_retr = st->st_tx_upper = 0;
-
+
+
+
+
+
+
+
+
+
+
+
+
-                TAILQ_FOREACH(ni, &ic->ic_node, ni_list) {
+                        ni->ni_txrate = 0;              /* use lowest rate */
-                        st = ni->ni_private;
-                        st->st_tx_ok = st->st_tx_err = st->st_tx_retr =
@@ -2186 +2203 @@
-}
-
+/* 
+ * Examine and potentially adjust the transmit rate.
+ */
-static void
-ath_rate_ctl(void *arg, struct ieee80211_node *ni)
@@ -2198 +2218 @@
-         * XXX: very primitive version.
-         */
-(void) sc;                     /* NB: silence compiler */
+sc->sc_stats.ast_rate_calls++;
-
-        enough = (st->st_tx_ok + st->st_tx_err >= 10);
@@ -2221 +2241 @@
-                break;
-        case -1:
-
+ {
-                        ni->ni_txrate--;
+                        sc->sc_stats.ast_rate_drop++;
+                }
-                st->st_tx_upper = 0;
-                break;
@@ -2229 +2251 @@
-                        break;
-                st->st_tx_upper = 0;
-
+ {
-                        ni->ni_txrate++;
+                        sc->sc_stats.ast_rate_raise++;
+                }
-                break;
-        }
@@ -2402 +2426 @@
-        STAT(be_nobuf);
-
+        STAT(per_cal);          STAT(per_rfgain);
+        STAT(rate_calls);       STAT(rate_raise);       STAT(rate_drop);
+
-        return cp - page;
-#undef PHYSTAT

cvs-import/trunk/driver/if_athvar.h

@@ -85 +85 @@
-        u_int32_t       ast_rx_nobuf;   /* rx setup failed 'cuz no skbuff */
-        u_int32_t       ast_be_nobuf;   /* no skbuff available for beacon */
+        u_int32_t       ast_per_cal;    /* periodic calibration calls */
+        u_int32_t       ast_per_rfgain; /* periodic calibration rfgain reset */
+        u_int32_t       ast_rate_calls; /* rate control checks */
+        u_int32_t       ast_rate_raise; /* rate control raised xmit rate */
+        u_int32_t       ast_rate_drop;  /* rate control dropped xmit rate */
-};
-