Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Jan 2004 16:14:59 -0800 (PST)
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 46025 for review
Message-ID:  <200401280014.i0S0ExMJ054102@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=46025

Change 46025 by sam@sam_ebb on 2004/01/27 16:14:29

	correct assertion on beacon frame length: ieee80211_getmgtframe
	allocates space for the 802.11 header so it must be included in
	the calculations

Affected files ...

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

Differences ...

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

@@ -705,9 +705,9 @@
 	}
 	frm = ieee80211_add_xrates(frm, rs);
 	m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *);
-	KASSERT(m->m_pkthdr.len <= pktlen,
+	KASSERT(m->m_pkthdr.len <= pktlen + sizeof(struct ieee80211_frame),
 		("beacon bigger than expected, len %u calculated %u",
-		m->m_pkthdr.len, pktlen));
+		m->m_pkthdr.len, pktlen + sizeof(struct ieee80211_frame)));
 	return m;
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401280014.i0S0ExMJ054102>