From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 22:49:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 00E091065674; Fri, 28 Mar 2008 22:49:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B51281065671
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 22:49:03 +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 A4D8F8FC30
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 22:49:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SMn3FU044164
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 22:49:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SMn30L044162
	for perforce@freebsd.org; Fri, 28 Mar 2008 22:49:03 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 22:49:03 GMT
Message-Id: <200803282249.m2SMn30L044162@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138863 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Mar 2008 22:49:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=138863

Change 138863 by sam@sam_ebb on 2008/03/28 22:48:36

	force ENETRESET work when plumbing the WPA ie's so if the ifnet
	is UP the beacon frame will get rebuilt; this is really a workaround
	for hostapd doing things in the wrong order

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#48 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#48 (text+ko) ====

@@ -2211,9 +2211,16 @@
 				    appie->ie_len - (2 + data[1]));
 			}
 			if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
-			    vap->iv_opmode == IEEE80211_M_IBSS)
-				ieee80211_beacon_notify(vap,
-				    IEEE80211_BEACON_APPIE);
+			    vap->iv_opmode == IEEE80211_M_IBSS) {
+				/*
+				 * Must rebuild beacon frame as the update
+				 * mechanism doesn't handle WPA/RSN ie's.
+				 * Could extend it but it doesn't normally
+				 * change; this is just to deal with hostapd
+				 * plumbing the ie after the interface is up.
+				 */
+				error = ENETRESET;
+			}
 		}
 		break;
 	default: