[src/trunk]: src/sys/net80211 Complete merge.

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/13cb01b9437e
branches:  trunk
changeset: 551481:13cb01b9437e
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Sun Sep 07 04:10:39 2003 +0000

description:
Complete merge.

diffstat:

 sys/net80211/ieee80211_output.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 842035d469b8 -r 13cb01b9437e sys/net80211/ieee80211_output.c
--- a/sys/net80211/ieee80211_output.c   Sun Sep 07 04:05:33 2003 +0000
+++ b/sys/net80211/ieee80211_output.c   Sun Sep 07 04:10:39 2003 +0000
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.4 2003/08/19 22:17:03 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.5 2003/09/01 02:55:09 sam Exp $");
 
 #include "opt_inet.h"
 
@@ -289,8 +289,9 @@
 {
        struct mbuf *m;
 
+       KASSERT(pktlen <= MCLBYTES, ("802.11 packet too large: %u", pktlen));
 #ifdef __FreeBSD__
-       if (pktlen > MHLEN)
+       if (pktlen <= MHLEN)
                MGETHDR(m, flags, type);
        else
                m = m_getcl(flags, type, M_PKTHDR);