From owner-svn-src-stable@FreeBSD.ORG  Mon Feb 22 17:10:47 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 75493106566C;
	Mon, 22 Feb 2010 17:10:47 +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 621208FC1F;
	Mon, 22 Feb 2010 17:10:47 +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 o1MHAlB1006473;
	Mon, 22 Feb 2010 17:10:47 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1MHAl5L006471;
	Mon, 22 Feb 2010 17:10:47 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201002221710.o1MHAl5L006471@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Mon, 22 Feb 2010 17:10:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204215 - stable/8/sys/net80211
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2010 17:10:47 -0000

Author: bschmidt
Date: Mon Feb 22 17:10:47 2010
New Revision: 204215
URL: http://svn.freebsd.org/changeset/base/204215

Log:
  MFC r203673:
  Ensure that tkip_mixing_phase1() is called after a rekeying event when
  using plain s/w crypto.
  
  PR:		bin/142547
  Approved by:	rpaulo (mentor)

Modified:
  stable/8/sys/net80211/ieee80211_crypto_tkip.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/net80211/ieee80211_crypto_tkip.c
==============================================================================
--- stable/8/sys/net80211/ieee80211_crypto_tkip.c	Mon Feb 22 17:03:45 2010	(r204214)
+++ stable/8/sys/net80211/ieee80211_crypto_tkip.c	Mon Feb 22 17:10:47 2010	(r204215)
@@ -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;
 }