From owner-svn-src-stable-7@FreeBSD.ORG  Fri Nov 19 18:59:35 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F144B1065670;
	Fri, 19 Nov 2010 18:59:35 +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 E067A8FC13;
	Fri, 19 Nov 2010 18:59:35 +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 oAJIxZPb086050;
	Fri, 19 Nov 2010 18:59:35 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAJIxZ18086048;
	Fri, 19 Nov 2010 18:59:35 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201011191859.oAJIxZ18086048@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Fri, 19 Nov 2010 18:59:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215543 - stable/7/sys/net80211
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Nov 2010 18:59:36 -0000

Author: bschmidt
Date: Fri Nov 19 18:59:35 2010
New Revision: 215543
URL: http://svn.freebsd.org/changeset/base/215543

Log:
  MFC r203673:
  Ensure that tkip_mixing_phase1() is called after a rekeying event when
  using plain s/w crypto.

Modified:
  stable/7/sys/net80211/ieee80211_crypto_tkip.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/net80211/ieee80211_crypto_tkip.c
==============================================================================
--- stable/7/sys/net80211/ieee80211_crypto_tkip.c	Fri Nov 19 18:32:08 2010	(r215542)
+++ stable/7/sys/net80211/ieee80211_crypto_tkip.c	Fri Nov 19 18:59:35 2010	(r215543)
@@ -143,6 +143,7 @@ tkip_setkey(struct ieee80211_key *k)
 		return 0;
 	}
 	k->wk_keytsc = 1;		/* TSC starts at 1 */
+	ctx->rx_phase1_done = 0;
 	return 1;
 }