From owner-svn-src-head@FreeBSD.ORG  Fri Sep  4 22:34:58 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03BB0106568B;
	Fri,  4 Sep 2009 22:34:58 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E777B8FC12;
	Fri,  4 Sep 2009 22:34:57 +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 n84MYvMZ022113;
	Fri, 4 Sep 2009 22:34:57 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n84MYvcJ022111;
	Fri, 4 Sep 2009 22:34:57 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200909042234.n84MYvcJ022111@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 4 Sep 2009 22:34:57 +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: r196842 - head/sys/dev/mwl
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Sep 2009 22:34:58 -0000

Author: sam
Date: Fri Sep  4 22:34:57 2009
New Revision: 196842
URL: http://svn.freebsd.org/changeset/base/196842

Log:
  must also plumb static wep keys to the local sta db in sta mode; not
  sure when this became necessary and might be caused by some missing
  code to do auto-configuration of DWDS usage
  
  Noticed by:	Felix Feng <unixwind@gmail.com>

Modified:
  head/sys/dev/mwl/if_mwl.c

Modified: head/sys/dev/mwl/if_mwl.c
==============================================================================
--- head/sys/dev/mwl/if_mwl.c	Fri Sep  4 21:49:37 2009	(r196841)
+++ head/sys/dev/mwl/if_mwl.c	Fri Sep  4 22:34:57 2009	(r196842)
@@ -1738,6 +1738,10 @@ mwl_key_set(struct ieee80211vap *vap, co
 		 * WEP keys when the sta reaches AUTH state.
 		 */
 		macaddr = vap->iv_bss->ni_bssid;
+		if ((k->wk_flags & IEEE80211_KEY_GROUP) == 0) {
+			/* XXX plumb to local sta db too for static key wep */
+			mwl_hal_keyset(hvap, &hk, vap->iv_myaddr);
+		}
 	} else if (vap->iv_opmode == IEEE80211_M_WDS &&
 	    vap->iv_state != IEEE80211_S_RUN) {
 		/*