From owner-svn-src-user@FreeBSD.ORG  Thu Sep 22 10:52:14 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C9EB106564A;
	Thu, 22 Sep 2011 10:52:14 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BEAE8FC0A;
	Thu, 22 Sep 2011 10:52:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8MAqEvi019577;
	Thu, 22 Sep 2011 10:52:14 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8MAqEd9019575;
	Thu, 22 Sep 2011 10:52:14 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109221052.p8MAqEd9019575@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 22 Sep 2011 10:52:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225727 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Sep 2011 10:52:14 -0000

Author: adrian
Date: Thu Sep 22 10:52:14 2011
New Revision: 225727
URL: http://svn.freebsd.org/changeset/base/225727

Log:
  Revert the STA keycache multicast entry fix for now; just so I can tinker
  with some other things that need it.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_keycache.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_keycache.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_keycache.c	Thu Sep 22 08:39:20 2011	(r225726)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_keycache.c	Thu Sep 22 10:52:14 2011	(r225727)
@@ -214,14 +214,20 @@ ath_keyset(struct ath_softc *sc, struct 
 		hk.kv_type = HAL_CIPHER_CLR;
 
 	/*
+	 * XXX TODO: check this:
+	 * 
 	 * Group keys on hardware that supports multicast frame
 	 * key search should only be done in adhoc/hostap mode,
 	 * not STA mode.
 	 *
 	 * XXX TODO: what about mesh, tdma?
 	 */
+#if 0
 	if ((vap->iv_opmode == IEEE80211_M_HOSTAP ||
 	     vap->iv_opmode == IEEE80211_M_IBSS) &&
+#else
+	if (
+#endif
 	    (k->wk_flags & IEEE80211_KEY_GROUP) &&
 	    sc->sc_mcastkey) {
 		/*