From owner-svn-src-all@FreeBSD.ORG  Mon Feb  8 18:16:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CBDE010656AC;
	Mon,  8 Feb 2010 18:16:59 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB7F88FC0A;
	Mon,  8 Feb 2010 18:16:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o18IGxZj019441;
	Mon, 8 Feb 2010 18:16:59 GMT (envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o18IGx2B019439;
	Mon, 8 Feb 2010 18:16:59 GMT (envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201002081816.o18IGx2B019439@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Mon, 8 Feb 2010 18:16:59 +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: r203673 - head/sys/net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Feb 2010 18:16:59 -0000

Author: bschmidt
Date: Mon Feb  8 18:16:59 2010
New Revision: 203673
URL: http://svn.freebsd.org/changeset/base/203673

Log:
  Ensure that tkip_mixing_phase1() is called after a rekeying event when
  useing plain s/w crypto.
  
  Approved by:	rpaulo (mentor)
  Reviewed by:	sam

Modified:
  head/sys/net80211/ieee80211_crypto_tkip.c

Modified: head/sys/net80211/ieee80211_crypto_tkip.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto_tkip.c	Mon Feb  8 17:38:39 2010	(r203672)
+++ head/sys/net80211/ieee80211_crypto_tkip.c	Mon Feb  8 18:16:59 2010	(r203673)
@@ -144,6 +144,7 @@ tkip_setkey(struct ieee80211_key *k)
 		return 0;
 	}
 	k->wk_keytsc = 1;		/* TSC starts at 1 */
+	ctx->rx_phase1_done = 0;
 	return 1;
 }