[Madwifi-cvs] madwifi/ath if_ath.c,1.1.2.21,1.1.2.22
Status: Beta
Brought to you by:
otaku
From: Sam L. <sam...@us...> - 2004-07-27 17:43:41
|
Update of /cvsroot/madwifi/madwifi/ath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12175 Modified Files: Tag: WPA if_ath.c Log Message: consolidate common code under a #define Index: if_ath.c =================================================================== RCS file: /cvsroot/madwifi/madwifi/ath/Attic/if_ath.c,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -C2 -d -r1.1.2.21 -r1.1.2.22 *** if_ath.c 19 Jul 2004 18:04:49 -0000 1.1.2.21 --- if_ath.c 27 Jul 2004 17:43:30 -0000 1.1.2.22 *************** *** 1964,1967 **** --- 1964,1969 ---- ath_desc_alloc(struct ath_softc *sc) { + #define DS2PHYS(_sc, _ds) \ + ((_sc)->sc_desc_daddr + ((caddr_t)(_ds) - (caddr_t)(_sc)->sc_desc)) int i, bsize; struct ath_desc *ds; *************** *** 1990,1995 **** for (i = 0; i < ATH_RXBUF; i++, bf++, ds++) { bf->bf_desc = ds; ! bf->bf_daddr = sc->sc_desc_daddr + ! ((caddr_t)ds - (caddr_t)sc->sc_desc); STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); } --- 1992,1996 ---- for (i = 0; i < ATH_RXBUF; i++, bf++, ds++) { bf->bf_desc = ds; ! bf->bf_daddr = DS2PHYS(sc, ds); STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); } *************** *** 1998,2003 **** for (i = 0; i < ATH_TXBUF; i++, bf++, ds += ATH_TXDESC) { bf->bf_desc = ds; ! bf->bf_daddr = sc->sc_desc_daddr + ! ((caddr_t)ds - (caddr_t)sc->sc_desc); STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); } --- 1999,2003 ---- for (i = 0; i < ATH_TXBUF; i++, bf++, ds += ATH_TXDESC) { bf->bf_desc = ds; ! bf->bf_daddr = DS2PHYS(sc, ds); STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); } *************** *** 2005,2009 **** /* beacon buffer */ bf->bf_desc = ds; ! bf->bf_daddr = sc->sc_desc_daddr + ((caddr_t)ds - (caddr_t)sc->sc_desc); sc->sc_bcbuf = bf; return 0; --- 2005,2009 ---- /* beacon buffer */ bf->bf_desc = ds; ! bf->bf_daddr = DS2PHYS(sc, ds); sc->sc_bcbuf = bf; return 0; *************** *** 2013,2016 **** --- 2013,2017 ---- sc->sc_desc = NULL; return ENOMEM; + #undef DS2PHYS } |