From owner-p4-projects@FreeBSD.ORG  Sun Feb  1 13:07:50 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3495D16A4D0; Sun,  1 Feb 2004 13:07:50 -0800 (PST)
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 0C23816A4CE
	for <perforce@freebsd.org>; Sun,  1 Feb 2004 13:07:50 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B2DC43D39
	for <perforce@freebsd.org>; Sun,  1 Feb 2004 13:07:49 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i11L7n0B099826
	for <perforce@freebsd.org>; Sun, 1 Feb 2004 13:07:49 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i11L7mWG099823
	for perforce@freebsd.org; Sun, 1 Feb 2004 13:07:48 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sun, 1 Feb 2004 13:07:48 -0800 (PST)
Message-Id: <200402012107.i11L7mWG099823@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 46322 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: Sun, 01 Feb 2004 21:07:50 -0000

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

Change 46322 by sam@sam_ebb on 2004/02/01 13:07:22

	adjust pointer after appending the erp element id

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#12 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#12 (text+ko) ====

@@ -459,7 +459,7 @@
 			*frm++ = 0; *frm++ = 0;		/* TODO: ATIM window */
 		}
 		if (ic->ic_curmode == IEEE80211_MODE_11G)
-			ieee80211_add_erp(frm, ic);
+			frm = ieee80211_add_erp(frm, ic);
 		frm = ieee80211_add_xrates(frm, &ic->ic_bss->ni_rates);
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *);
 		break;
@@ -752,7 +752,7 @@
 		bo->bo_dtim_len = 6;
 	}
 	if (ic->ic_curmode == IEEE80211_MODE_11G)
-		ieee80211_add_erp(frm, ic);
+		frm = ieee80211_add_erp(frm, ic);
 	bo->bo_xrates = frm;
 	efrm = ieee80211_add_xrates(frm, rs);
 	bo->bo_xrates_len = efrm - frm;