Date: Thu, 18 Aug 2011 08:58:10 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r224964 - user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416 Message-ID: <201108180858.p7I8wASG046912@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Thu Aug 18 08:58:10 2011 New Revision: 224964 URL: http://svn.freebsd.org/changeset/base/224964 Log: To bring this in line with other function calls, use the cipher field stored in the HAL state, rather than the explictly given one. Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Thu Aug 18 08:45:35 2011 (r224963) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Thu Aug 18 08:58:10 2011 (r224964) @@ -318,6 +318,9 @@ ar5416FillTxDesc(struct ath_hal *ah, str return AH_TRUE; } +/* + * NB: cipher is no longer used, it's calculated. + */ HAL_BOOL ar5416ChainTxDesc(struct ath_hal *ah, struct ath_desc *ds, u_int pktLen, @@ -362,7 +365,7 @@ ar5416ChainTxDesc(struct ath_hal *ah, st ads->ds_ctl0 |= AR_DestIdxValid; } - ads->ds_ctl6 = SM(ahp->ah_keytype[cipher], AR_EncrType); + ads->ds_ctl6 |= SM(ahp->ah_keytype[keyIx], AR_EncrType); if (isaggr) { ads->ds_ctl6 |= SM(delims, AR_PadDelim); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108180858.p7I8wASG046912>