From owner-p4-projects@FreeBSD.ORG  Mon Feb  7 18:21:43 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 132B516A4DE; Mon,  7 Feb 2005 18:21:43 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 30DE616A4D7
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 18:21:42 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 19EB743D2F
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 18:21:42 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17ILfLa031463
	for <perforce@freebsd.org>; Mon, 7 Feb 2005 18:21:41 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17ILfx7031460
	for perforce@freebsd.org; Mon, 7 Feb 2005 18:21:41 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 7 Feb 2005 18:21:41 GMT
Message-Id: <200502071821.j17ILfx7031460@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>
Subject: PERFORCE change 70530 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 07 Feb 2005 18:21:43 -0000

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

Change 70530 by sam@sam_ebb on 2005/02/07 18:21:08

	correct mis-merge

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_input.c#4 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#4 (text+ko) ====

@@ -2253,6 +2253,14 @@
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE);
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN);
 		IEEE80211_VERIFY_SSID(vap->iv_bss, ssid);
+		if ((ic->ic_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) {
+			IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT,
+			    wh, ieee80211_mgt_subtype_name[subtype >>
+				IEEE80211_FC0_SUBTYPE_SHIFT],
+			    "%s", "no ssid with ssid suppression enabled");
+			ic->ic_stats.is_rx_ssidmismatch++; /*XXX*/
+			return;
+		}
 
 		if (ni == vap->iv_bss) {
 			if (vap->iv_opmode == IEEE80211_M_IBSS) {