Date: Mon, 9 May 2005 15:36:27 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76751 for review Message-ID: <200505091536.j49FaR5x075963@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=76751 Change 76751 by sam@sam_ebb on 2005/05/09 15:36:15 fix mismerge; ap mode works Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#10 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#6 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#10 (text+ko) ==== @@ -2766,8 +2766,6 @@ * Enable the CAB queue before the beacon queue to * insure cab frames are triggered by this beacon. */ - if (sc->sc_boff.bo_tim[4] & 1) /* NB: only at DTIM */ - ath_hal_txstart(ah, cabq->axq_qnum); if (avp->av_boff.bo_tim[4] & 1) { /* NB: only at DTIM */ struct ath_buf *bfmcast; /* ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#6 (text+ko) ==== @@ -330,7 +330,6 @@ u_int sc_bmisscount; /* missed beacon transmits */ u_int32_t sc_ant_tx[8]; /* recent tx frames/antenna */ struct ath_txq *sc_cabq; /* tx q for cab frames */ - struct ieee80211_beacon_offsets sc_boff;/* dynamic update state */ struct task sc_bmisstask; /* bmiss int processing */ struct task sc_bstucktask; /* stuck beacon processing */ enum {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505091536.j49FaR5x075963>