From owner-cvs-src-old@FreeBSD.ORG  Tue Jul 21 19:36:42 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 065181065808
	for <cvs-src-old@freebsd.org>; Tue, 21 Jul 2009 19:36:42 +0000 (UTC)
	(envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 67D8A8FC1D
	for <cvs-src-old@freebsd.org>; Tue, 21 Jul 2009 19:36:40 +0000 (UTC)
	(envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6LJaeY7087651
	for <cvs-src-old@freebsd.org>; Tue, 21 Jul 2009 19:36:40 GMT
	(envelope-from sam@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6LJaeLK087650
	for cvs-src-old@freebsd.org; Tue, 21 Jul 2009 19:36:40 GMT
	(envelope-from sam@repoman.freebsd.org)
Message-Id: <200907211936.n6LJaeLK087650@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	sam@repoman.freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 21 Jul 2009 19:36:32 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/net80211 ieee80211_crypto.c ieee80211_crypto.h
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jul 2009 19:36:42 -0000

sam         2009-07-21 19:36:32 UTC

  FreeBSD src repository

  Modified files:
    sys/net80211         ieee80211_crypto.c ieee80211_crypto.h 
  Log:
  SVN rev 195812 on 2009-07-21 19:36:32Z by sam
  
  Correct handling of keys that already have a hardware/device key index:
  this was broken in r183248 when the check of wk_keyix was replaced by
  a check of IEEE80211_KEY_DEVKEY (because the flag was clobbered).  Define
  IEEE80211_KEY_DEVICE to specify flags that are owned by net80211/driver
  and use this to preserve IEEE80211_KEY_DEVKEY so we don't ask the driver
  for another key index when we already have one.
  
  Testing by:     Daniel Thiele, Wes Morgan
  Reviewed by:    rpaulo
  Approved by:    re (kib)
  
  Revision  Changes    Path
  1.23      +6 -6      src/sys/net80211/ieee80211_crypto.c
  1.23      +2 -0      src/sys/net80211/ieee80211_crypto.h