From owner-p4-projects@FreeBSD.ORG  Wed Jul 20 04:24:10 2005
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 0E90F16A421; Wed, 20 Jul 2005 04:24:10 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 C7BC616A41F
	for <perforce@freebsd.org>; Wed, 20 Jul 2005 04:24:09 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 957B943D48
	for <perforce@freebsd.org>; Wed, 20 Jul 2005 04:24:09 +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 j6K4O9f7023273
	for <perforce@freebsd.org>; Wed, 20 Jul 2005 04:24:09 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6K4O9rH023270
	for perforce@freebsd.org; Wed, 20 Jul 2005 04:24:09 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 20 Jul 2005 04:24:09 GMT
Message-Id: <200507200424.j6K4O9rH023270@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 80576 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: Wed, 20 Jul 2005 04:24:10 -0000

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

Change 80576 by sam@sam_ebb on 2005/07/20 04:23:15

	correct !ff check for tx fragmentation; can't depend on
	M_FF being set after ff encapsulation is done

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#46 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#46 (text+ko) ====

@@ -486,7 +486,7 @@
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct llc *llc;
-	int hdrsize, datalen, addqos, txfrag;
+	int hdrsize, datalen, addqos, txfrag, isff;
 
 	/*
 	 * Copy existing Ethernet header to a safe place.  The
@@ -540,7 +540,7 @@
 	if (ic->ic_flags & IEEE80211_F_DATAPAD)
 		hdrsize = roundup(hdrsize, sizeof(u_int32_t));
 
-	if (m->m_flags & M_FF) {
+	if ((isff = m->m_flags & M_FF) != 0) {
 		struct mbuf *m2;
 		struct ether_header eh2;
 
@@ -671,7 +671,7 @@
 	/* check if xmit fragmentation is required */
 	txfrag = (m->m_pkthdr.len > ic->ic_fragthreshold &&
 	    !IEEE80211_IS_MULTICAST(wh->i_addr1) &&
-	    (m->m_flags & M_FF) == 0);		/* NB: don't fragment ff's */
+	    !isff);		/* NB: don't fragment ff's */
 	if (key != NULL) {
 		/*
 		 * IEEE 802.1X: send EAPOL frames always in the clear.