madwifi: remove braindead code that overwrote the user's antenna diversity setting...
[openwrt/svn-archive/archive.git] / package / madwifi / patches / 420-diversity_fix.patch
1 --- a/ath/if_ath.c
2 +++ b/ath/if_ath.c
3 @@ -5344,27 +5344,6 @@ ath_beacon_send(struct ath_softc *sc, in
4 } else if ((sc->sc_updateslot == COMMIT) && (sc->sc_slotupdate == slot))
5 ath_setslottime(sc); /* commit change to hardware */
6
7 - if ((!sc->sc_stagbeacons || slot == 0) && (!sc->sc_diversity)) {
8 - unsigned int otherant;
9 - /*
10 - * Check recent per-antenna transmit statistics and flip
11 - * the default rx antenna if noticeably more frames went out
12 - * on the non-default antenna. Only do this if rx diversity
13 - * is off.
14 - * XXX assumes 2 antennae
15 - */
16 - otherant = sc->sc_defant & 1 ? 2 : 1;
17 - if (sc->sc_ant_tx[otherant] > sc->sc_ant_tx[sc->sc_defant] +
18 - ATH_ANTENNA_DIFF) {
19 - DPRINTF(sc, ATH_DEBUG_BEACON,
20 - "Flip default antenna to %u, %u > %u\n",
21 - otherant, sc->sc_ant_tx[otherant],
22 - sc->sc_ant_tx[sc->sc_defant]);
23 - ath_setdefantenna(sc, otherant);
24 - }
25 - sc->sc_ant_tx[1] = sc->sc_ant_tx[2] = 0;
26 - }
27 -
28 if (bfaddr != 0) {
29 /*
30 * Stop any current DMA and put the new frame(s) on the queue.