From owner-svn-src-head@FreeBSD.ORG Fri Jun 5 23:10:31 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F19541065696; Fri, 5 Jun 2009 23:10:30 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DFA2B8FC1C; Fri, 5 Jun 2009 23:10:30 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55NAUOm040846; Fri, 5 Jun 2009 23:10:30 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55NAUow040842; Fri, 5 Jun 2009 23:10:30 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200906052310.n55NAUow040842@svn.freebsd.org> From: Sam Leffler Date: Fri, 5 Jun 2009 23:10:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193541 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2009 23:10:32 -0000 Author: sam Date: Fri Jun 5 23:10:30 2009 New Revision: 193541 URL: http://svn.freebsd.org/changeset/base/193541 Log: add tid param to ieee80211_notify_replay_failure to get the correct rsc Modified: head/sys/net80211/ieee80211_crypto.h head/sys/net80211/ieee80211_crypto_ccmp.c head/sys/net80211/ieee80211_crypto_tkip.c head/sys/net80211/ieee80211_freebsd.c Modified: head/sys/net80211/ieee80211_crypto.h ============================================================================== --- head/sys/net80211/ieee80211_crypto.h Fri Jun 5 22:36:17 2009 (r193540) +++ head/sys/net80211/ieee80211_crypto.h Fri Jun 5 23:10:30 2009 (r193541) @@ -236,7 +236,7 @@ ieee80211_crypto_resetkey(struct ieee802 */ void ieee80211_notify_replay_failure(struct ieee80211vap *, const struct ieee80211_frame *, const struct ieee80211_key *, - uint64_t rsc); + uint64_t rsc, int tid); void ieee80211_notify_michael_failure(struct ieee80211vap *, const struct ieee80211_frame *, u_int keyix); #endif /* defined(__KERNEL__) || defined(_KERNEL) */ Modified: head/sys/net80211/ieee80211_crypto_ccmp.c ============================================================================== --- head/sys/net80211/ieee80211_crypto_ccmp.c Fri Jun 5 22:36:17 2009 (r193540) +++ head/sys/net80211/ieee80211_crypto_ccmp.c Fri Jun 5 23:10:30 2009 (r193541) @@ -230,7 +230,7 @@ ccmp_decap(struct ieee80211_key *k, stru /* * Replay violation. */ - ieee80211_notify_replay_failure(vap, wh, k, pn); + ieee80211_notify_replay_failure(vap, wh, k, pn, tid); vap->iv_stats.is_rx_ccmpreplay++; return 0; } Modified: head/sys/net80211/ieee80211_crypto_tkip.c ============================================================================== --- head/sys/net80211/ieee80211_crypto_tkip.c Fri Jun 5 22:36:17 2009 (r193540) +++ head/sys/net80211/ieee80211_crypto_tkip.c Fri Jun 5 23:10:30 2009 (r193541) @@ -284,7 +284,7 @@ tkip_decap(struct ieee80211_key *k, stru /* * Replay violation; notify upper layer. */ - ieee80211_notify_replay_failure(vap, wh, k, ctx->rx_rsc); + ieee80211_notify_replay_failure(vap, wh, k, ctx->rx_rsc, tid); vap->iv_stats.is_rx_tkipreplay++; return 0; } Modified: head/sys/net80211/ieee80211_freebsd.c ============================================================================== --- head/sys/net80211/ieee80211_freebsd.c Fri Jun 5 22:36:17 2009 (r193540) +++ head/sys/net80211/ieee80211_freebsd.c Fri Jun 5 23:10:30 2009 (r193541) @@ -528,14 +528,14 @@ ieee80211_notify_scan_done(struct ieee80 void ieee80211_notify_replay_failure(struct ieee80211vap *vap, const struct ieee80211_frame *wh, const struct ieee80211_key *k, - u_int64_t rsc) + u_int64_t rsc, int tid) { struct ifnet *ifp = vap->iv_ifp; IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2, "%s replay detected ", k->wk_cipher->ic_name, (intmax_t) rsc, - (intmax_t) k->wk_keyrsc[IEEE80211_NONQOS_TID], + (intmax_t) k->wk_keyrsc[tid], k->wk_keyix, k->wk_rxkeyix); if (ifp != NULL) { /* NB: for cipher test modules */ @@ -548,7 +548,7 @@ ieee80211_notify_replay_failure(struct i iev.iev_keyix = k->wk_rxkeyix; else iev.iev_keyix = k->wk_keyix; - iev.iev_keyrsc = k->wk_keyrsc[0]; /* XXX need tid */ + iev.iev_keyrsc = k->wk_keyrsc[tid]; iev.iev_rsc = rsc; CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_REPLAY, &iev, sizeof(iev));