Module Name: src
Committed By: ozaki-r
Date: Thu May 26 05:04:46 UTC 2016
Modified Files:
src/sys/dev/ic: ath.c atw.c bwi.c malo.c rt2560.c rt2661.c rt2860.c
wi.c
src/sys/dev/pci: if_rtwn.c if_wpi.c
src/sys/dev/usb: if_athn_usb.c if_atu.c if_otus.c if_rum.c if_run.c
if_upgt.c if_ural.c if_urtw.c if_urtwn.c if_zyd.c
src/sys/sys: mbuf.h
Log Message:
Introduce M_CLEARCTX and use it instead of open-coding rcvif
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/ic/ath.c
cvs rdiff -u -r1.158 -r1.159 src/sys/dev/ic/atw.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/bwi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/malo.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/rt2560.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ic/rt2661.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/rt2860.c
cvs rdiff -u -r1.238 -r1.239 src/sys/dev/ic/wi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_rtwn.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.161 -r1.162 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.120 src/sys/dev/ic/ath.c:1.121
--- src/sys/dev/ic/ath.c:1.120 Thu May 26 05:01:11 2016
+++ src/sys/dev/ic/ath.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.120 2016/05/26 05:01:11 ozaki-r Exp $ */
+/* $NetBSD: ath.c,v 1.121 2016/05/26 05:04:46 ozaki-r Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.120 2016/05/26 05:01:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.121 2016/05/26 05:04:46 ozaki-r Exp $");
#endif
/*
@@ -1400,7 +1400,7 @@ ath_start(struct ifnet *ifp)
* to pass it along.
*/
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
wh = mtod(m, struct ieee80211_frame *);
if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) ==
Index: src/sys/dev/ic/atw.c
diff -u src/sys/dev/ic/atw.c:1.158 src/sys/dev/ic/atw.c:1.159
--- src/sys/dev/ic/atw.c:1.158 Thu May 26 05:01:12 2016
+++ src/sys/dev/ic/atw.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: atw.c,v 1.158 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: atw.c,v 1.159 2016/05/26 05:04:46 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.158 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.159 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
@@ -3492,7 +3492,7 @@ atw_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m0);
if (m0 != NULL) {
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
} else if (ic->ic_state != IEEE80211_S_RUN)
break; /* send no data until associated */
else {
Index: src/sys/dev/ic/bwi.c
diff -u src/sys/dev/ic/bwi.c:1.28 src/sys/dev/ic/bwi.c:1.29
--- src/sys/dev/ic/bwi.c:1.28 Thu May 26 05:01:12 2016
+++ src/sys/dev/ic/bwi.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bwi.c,v 1.28 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: bwi.c,v 1.29 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */
/*
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.28 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.29 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -7366,7 +7366,7 @@ bwi_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
mgt_pkt = 1;
} else {
Index: src/sys/dev/ic/malo.c
diff -u src/sys/dev/ic/malo.c:1.6 src/sys/dev/ic/malo.c:1.7
--- src/sys/dev/ic/malo.c:1.6 Thu May 26 05:01:12 2016
+++ src/sys/dev/ic/malo.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: malo.c,v 1.6 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: malo.c,v 1.7 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: malo.c,v 1.92 2010/08/27 17:08:00 jsg Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.6 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.7 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -998,7 +998,7 @@ malo_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m0);
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
bpf_mtap3(ic->ic_rawbpf, m0);
Index: src/sys/dev/ic/rt2560.c
diff -u src/sys/dev/ic/rt2560.c:1.26 src/sys/dev/ic/rt2560.c:1.27
--- src/sys/dev/ic/rt2560.c:1.26 Thu May 26 05:01:12 2016
+++ src/sys/dev/ic/rt2560.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2560.c,v 1.26 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: rt2560.c,v 1.27 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */
/* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
@@ -24,7 +24,7 @@
* http://www.ralinktech.com/
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.26 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.27 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
@@ -2073,7 +2073,7 @@ rt2560_start(struct ifnet *ifp)
break;
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
bpf_mtap3(ic->ic_rawbpf, m0);
if (rt2560_tx_mgt(sc, m0, ni) != 0)
break;
Index: src/sys/dev/ic/rt2661.c
diff -u src/sys/dev/ic/rt2661.c:1.31 src/sys/dev/ic/rt2661.c:1.32
--- src/sys/dev/ic/rt2661.c:1.31 Thu May 26 05:01:12 2016
+++ src/sys/dev/ic/rt2661.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661.c,v 1.31 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: rt2661.c,v 1.32 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $ */
/* $FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $ */
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.31 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.32 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
@@ -1807,7 +1807,7 @@ rt2661_start(struct ifnet *ifp)
break;
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
bpf_mtap3(ic->ic_rawbpf, m0);
if (rt2661_tx_mgt(sc, m0, ni) != 0)
break;
Index: src/sys/dev/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.9 src/sys/dev/ic/rt2860.c:1.10
--- src/sys/dev/ic/rt2860.c:1.9 Thu May 26 05:01:12 2016
+++ src/sys/dev/ic/rt2860.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.9 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: rt2860.c,v 1.10 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.9 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.10 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1734,7 +1734,7 @@ rt2860_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
goto sendit;
}
if (ic->ic_state != IEEE80211_S_RUN)
Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.238 src/sys/dev/ic/wi.c:1.239
--- src/sys/dev/ic/wi.c:1.238 Thu May 26 05:01:12 2016
+++ src/sys/dev/ic/wi.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.238 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: wi.c,v 1.239 2016/05/26 05:04:46 ozaki-r Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.238 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.239 2016/05/26 05:04:46 ozaki-r Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -1107,7 +1107,7 @@ wi_start(struct ifnet *ifp)
frmhdr.wi_ehdr.ether_type = 0;
wh = mtod(m0, struct ieee80211_frame *);
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
} else if (ic->ic_state == IEEE80211_S_RUN) {
IFQ_POLL(&ifp->if_snd, m0);
if (m0 == NULL)
Index: src/sys/dev/pci/if_rtwn.c
diff -u src/sys/dev/pci/if_rtwn.c:1.6 src/sys/dev/pci/if_rtwn.c:1.7
--- src/sys/dev/pci/if_rtwn.c:1.6 Thu May 26 05:01:12 2016
+++ src/sys/dev/pci/if_rtwn.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtwn.c,v 1.6 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_rtwn.c,v 1.7 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $ */
#define IEEE80211_NO_HT
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.6 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.7 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2061,7 +2061,7 @@ rtwn_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
goto sendit;
}
if (ic->ic_state != IEEE80211_S_RUN)
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.72 src/sys/dev/pci/if_wpi.c:1.73
--- src/sys/dev/pci/if_wpi.c:1.72 Thu May 26 05:01:12 2016
+++ src/sys/dev/pci/if_wpi.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.72 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_wpi.c,v 1.73 2016/05/26 05:04:46 ozaki-r Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.72 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.73 2016/05/26 05:04:46 ozaki-r Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -2059,7 +2059,7 @@ wpi_start(struct ifnet *ifp)
if (m0 != NULL) {
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
/* management frames go into ring 0 */
if (sc->txq[0].queued > sc->txq[0].count - 8) {
Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.10 src/sys/dev/usb/if_athn_usb.c:1.11
--- src/sys/dev/usb/if_athn_usb.c:1.10 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_athn_usb.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.10 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.11 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.10 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.11 2016/05/26 05:04:46 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2428,7 +2428,7 @@ athn_usb_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
goto sendit;
}
if (ic->ic_state != IEEE80211_S_RUN)
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.52 src/sys/dev/usb/if_atu.c:1.53
--- src/sys/dev/usb/if_atu.c:1.52 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_atu.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.52 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_atu.c,v 1.53 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.52 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.53 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1940,7 +1940,7 @@ atu_start(struct ifnet *ifp)
* to pass it along.
*/
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
/* sc->sc_stats.ast_tx_mgmt++; */
}
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.27 src/sys/dev/usb/if_otus.c:1.28
--- src/sys/dev/usb/if_otus.c:1.27 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_otus.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.27 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_otus.c,v 1.28 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.27 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.28 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2092,7 +2092,7 @@ otus_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
goto sendit;
}
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.53 src/sys/dev/usb/if_rum.c:1.54
--- src/sys/dev/usb/if_rum.c:1.53 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_rum.c Thu May 26 05:04:46 2016
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.53 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_rum.c,v 1.54 2016/05/26 05:04:46 ozaki-r Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.53 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.54 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1269,7 +1269,7 @@ rum_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m0);
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
bpf_mtap3(ic->ic_rawbpf, m0);
if (rum_tx_data(sc, m0, ni) != 0)
break;
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.13 src/sys/dev/usb/if_run.c:1.14
--- src/sys/dev/usb/if_run.c:1.13 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_run.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.13 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_run.c,v 1.14 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.13 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.14 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2380,7 +2380,7 @@ run_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
goto sendit;
}
if (ic->ic_state != IEEE80211_S_RUN)
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.15 src/sys/dev/usb/if_upgt.c:1.16
--- src/sys/dev/usb/if_upgt.c:1.15 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_upgt.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.15 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_upgt.c,v 1.16 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.15 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.16 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -1461,7 +1461,7 @@ upgt_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
bpf_mtap3(ic->ic_rawbpf, m);
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.47 src/sys/dev/usb/if_ural.c:1.48
--- src/sys/dev/usb/if_ural.c:1.47 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_ural.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.47 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_ural.c,v 1.48 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.47 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.48 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1362,7 +1362,7 @@ ural_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m0);
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
bpf_mtap3(ic->ic_rawbpf, m0);
if (ural_tx_mgt(sc, m0, ni) != 0)
break;
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.8 src/sys/dev/usb/if_urtw.c:1.9
--- src/sys/dev/usb/if_urtw.c:1.8 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_urtw.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.8 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_urtw.c,v 1.9 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.8 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.9 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2434,7 +2434,7 @@ urtw_start(struct ifnet *ifp)
}
IF_DEQUEUE(&ic->ic_mgtq, m0);
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
bpf_mtap3(ic->ic_rawbpf, m0);
if (urtw_tx_start(sc, ni, m0, URTW_PRIORITY_NORMAL)
!= 0)
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.43 src/sys/dev/usb/if_urtwn.c:1.44
--- src/sys/dev/usb/if_urtwn.c:1.43 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_urtwn.c Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.43 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.44 2016/05/26 05:04:46 ozaki-r Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.43 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.44 2016/05/26 05:04:46 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2662,7 +2662,7 @@ urtwn_start(struct ifnet *ifp)
}
IF_DEQUEUE(&ic->ic_mgtq, m);
ni = M_GETCTX(m, struct ieee80211_node *);
- m->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m);
goto sendit;
}
if (ic->ic_state != IEEE80211_S_RUN)
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.39 src/sys/dev/usb/if_zyd.c:1.40
--- src/sys/dev/usb/if_zyd.c:1.39 Thu May 26 05:01:12 2016
+++ src/sys/dev/usb/if_zyd.c Thu May 26 05:04:46 2016
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.39 2016/05/26 05:01:12 ozaki-r Exp $ */
+/* $NetBSD: if_zyd.c,v 1.40 2016/05/26 05:04:46 ozaki-r Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.39 2016/05/26 05:01:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.40 2016/05/26 05:04:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2327,7 +2327,7 @@ zyd_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m0);
ni = M_GETCTX(m0, struct ieee80211_node *);
- m0->m_pkthdr.rcvif = NULL;
+ M_CLEARCTX(m0);
bpf_mtap3(ic->ic_rawbpf, m0);
if (zyd_tx_mgt(sc, m0, ni) != 0)
break;
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.161 src/sys/sys/mbuf.h:1.162
--- src/sys/sys/mbuf.h:1.161 Wed Apr 20 08:56:32 2016
+++ src/sys/sys/mbuf.h Thu May 26 05:04:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.161 2016/04/20 08:56:32 knakahara Exp $ */
+/* $NetBSD: mbuf.h,v 1.162 2016/05/26 05:04:46 ozaki-r Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -715,6 +715,7 @@ do { \
*/
#define M_GETCTX(m, t) ((t)(m)->m_pkthdr.rcvif)
#define M_SETCTX(m, c) ((void)((m)->m_pkthdr.rcvif = (void *)(c)))
+#define M_CLEARCTX(m) M_SETCTX((m), NULL)
#endif /* defined(_KERNEL) */
