From owner-p4-projects@FreeBSD.ORG  Sun Apr 22 05:16:15 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 74A1816A404; Sun, 22 Apr 2007 05:16:15 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3780B16A400
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 05:16:15 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2797613C43E
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 05:16:15 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3M5GFcj023494
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 05:16:15 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3M5GEMk023489
	for perforce@freebsd.org; Sun, 22 Apr 2007 05:16:14 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 22 Apr 2007 05:16:14 GMT
Message-Id: <200704220516.l3M5GEMk023489@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 118559 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: Sun, 22 Apr 2007 05:16:15 -0000

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

Change 118559 by sam@sam_ebb on 2007/04/22 05:15:31

	o treat QoS null data frame identically to non-QoS
	o replace variable use with known constant
	o correct typo in debug msg

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#100 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#100 (text+ko) ====

@@ -404,7 +404,8 @@
 		m = ieee80211_decap(ic, m, hdrspace);
 		if (m == NULL) {
 			/* don't count Null data frames as errors */
-			if (subtype == IEEE80211_FC0_SUBTYPE_NODATA)
+			if (subtype == IEEE80211_FC0_SUBTYPE_NODATA ||
+			    subtype == IEEE80211_FC0_SUBTYPE_QOS_NULL)
 				goto out;
 			IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT,
 			    ni->ni_macaddr, "data", "%s", "decap error");
@@ -461,7 +462,7 @@
 				    ni->ni_macaddr, "fast-frame",
 				    "%s", "m_pullup(llc) failed");
 				ic->ic_stats.is_rx_tooshort++;
-				return type;
+				return IEEE80211_FC0_TYPE_DATA;
 			}
 			llc = (struct llc *)(mtod(m, u_int8_t *) + 
 				sizeof(struct ether_header));
@@ -469,7 +470,7 @@
 				m_adj(m, FF_LLC_SIZE);
 				m = ieee80211_decap_fastframe(ic, ni, m);
 				if (m == NULL)
-					return type;
+					return IEEE80211_FC0_TYPE_DATA;
 			}
 		}
 #undef FF_LLC_SIZE
@@ -536,7 +537,7 @@
 			bpf_mtap(ic->ic_rawbpf, m);
 		(*ic->ic_recv_mgmt)(ic, m, ni, subtype, rssi, noise, rstamp);
 		m_freem(m);
-		return type;
+		return IEEE80211_FC0_TYPE_MGT;
 
 	case IEEE80211_FC0_TYPE_CTL:
 		ic->ic_stats.is_rx_ctl++;
@@ -1953,7 +1954,7 @@
 	struct ieee80211com *ic = ni->ni_ic;
 
 	IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY,
-	    "[%s] deny %s request, %srate set mismatch, rate 0x%x\n",
+	    "[%s] deny %s request, %s rate set mismatch, rate 0x%x\n",
 	    ether_sprintf(wh->i_addr2),
 	    reassoc ? "reassoc" : "assoc", tag, rate);
 	IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_BASIC_RATE);