Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of invalid KASSERT 

The mbuf being checked is allocated in ieee80211_getmgtframe just above,
so checking NULL of its CTX is meaningless.

Pointed out by mlelstv@
This commit is contained in:
ozaki-r 2016-06-20 08:57:18 +00:00
parent 42837aa3a5
commit bdb88f5405
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net80211/ieee80211_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ieee80211_output.c,v 1.55 2016/06/20 08:30:59 knakahara Exp $ */
/* $NetBSD: ieee80211_output.c,v 1.56 2016/06/20 08:57:18 ozaki-r Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.34 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.55 2016/06/20 08:30:59 knakahara Exp $");
__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.56 2016/06/20 08:57:18 ozaki-r Exp $");
#endif
#ifdef _KERNEL_OPT
@ -184,9 +184,6 @@ ieee80211_mgmt_output(struct ieee80211com *ic, struct ieee80211_node *ni,
M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
if (m == NULL)
return ENOMEM;
#ifdef __FreeBSD__
KASSERT(M_GETCTX(m, struct ieee80211_node *) == NULL);
#endif
M_SETCTX(m, ni);
wh = mtod(m, struct ieee80211_frame *);
@ -1344,7 +1341,6 @@ ieee80211_send_probereq(struct ieee80211_node *ni,
M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
if (m == NULL)
return ENOMEM;
KASSERT(M_GETCTX(m, struct ieee80211_node *) == NULL);
M_SETCTX(m, ni);
wh = mtod(m, struct ieee80211_frame *);