svn commit: r215543 - stable/7/sys/net80211

[Bernhard Schmidt]

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;
 }