summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorozaki-r <ozaki-r@NetBSD.org>2016-05-26 05:04:46 +0000
committerozaki-r <ozaki-r@NetBSD.org>2016-05-26 05:04:46 +0000
commit600d59d0cb8a65c4213c0d21d092e4db70eefbd5 (patch)
tree7bf76e4d90bb0794c53b343c9667a9d182a4f5bb /sys/dev/ic
parentbc1e0d1ce2ad769b66db3935e26d21bea6429379 (diff)
Introduce M_CLEARCTX and use it instead of open-coding rcvif
No functional change.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/ath.c6
-rw-r--r--sys/dev/ic/atw.c6
-rw-r--r--sys/dev/ic/bwi.c6
-rw-r--r--sys/dev/ic/malo.c6
-rw-r--r--sys/dev/ic/rt2560.c6
-rw-r--r--sys/dev/ic/rt2661.c6
-rw-r--r--sys/dev/ic/rt2860.c6
-rw-r--r--sys/dev/ic/wi.c6
8 files changed, 24 insertions, 24 deletions
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 59c48f3910f..8b6dab77b76 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -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) ==
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 06acea91596..c1922a8b7ab 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -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 {
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 7c7f0cc04fd..bd50502af18 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -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 {
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 56a3e607936..953ed9d861d 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -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);
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index c92b107e2fb..b6076d7953b 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -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;
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 8d7d1c4a147..fc97c9268c6 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -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;
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index 21f1440dfc2..b29bf623aa1 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -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)
diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c
index a050d12bd97..d94091b7565 100644
--- a/sys/dev/ic/wi.c
+++ b/sys/dev/ic/wi.c
@@ -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)