Module Name: src
Committed By: ozaki-r
Date: Mon Jun 20 08:57:18 UTC 2016
Modified Files:
src/sys/net80211: ieee80211_output.c
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/net80211/ieee80211_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net80211/ieee80211_output.c
diff -u src/sys/net80211/ieee80211_output.c:1.55 src/sys/net80211/ieee80211_output.c:1.56
--- src/sys/net80211/ieee80211_output.c:1.55 Mon Jun 20 08:30:59 2016
+++ src/sys/net80211/ieee80211_output.c Mon Jun 20 08:57:18 2016
@@ -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 ieee80211co
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
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 *);
