From owner-p4-projects@FreeBSD.ORG  Sat Mar 24 21:19:04 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 2B01416A404; Sat, 24 Mar 2007 21:19:04 +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 F024B16A401
	for <perforce@freebsd.org>; Sat, 24 Mar 2007 21:19:03 +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 E0B6913C468
	for <perforce@freebsd.org>; Sat, 24 Mar 2007 21:19:03 +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 l2OLJ3YA024288
	for <perforce@freebsd.org>; Sat, 24 Mar 2007 21:19:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2OLJ3T6024285
	for perforce@freebsd.org; Sat, 24 Mar 2007 21:19:03 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 24 Mar 2007 21:19:03 GMT
Message-Id: <200703242119.l2OLJ3T6024285@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 116505 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: Sat, 24 Mar 2007 21:19:04 -0000

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

Change 116505 by sam@sam_ebb on 2007/03/24 21:18:23

	always set members of the beacon offsets structure; don't
	assume the caller pre-zero's it

Affected files ...

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

Differences ...

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

@@ -2034,13 +2034,15 @@
 		bo->bo_wme = frm;
 		frm = ieee80211_add_wme_param(frm, &ic->ic_wme);
 		ic->ic_flags &= ~IEEE80211_F_WMEUPDATE;
-	}
+	} else
+		bo->bo_wme = NULL;
 	if (ic->ic_flags & IEEE80211_F_WPA)
 		frm = ieee80211_add_wpa(frm, ic);
 	if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) {
 		bo->bo_erp = frm;
 		frm = ieee80211_add_erp(frm, ic);
-	}
+	} else
+		bo->bo_erp = NULL;
 	efrm = ieee80211_add_xrates(frm, rs);
 	bo->bo_trailer_len = efrm - bo->bo_trailer;
 	m->m_pkthdr.len = m->m_len = efrm - mtod(m, u_int8_t *);