Module Name: src
Committed By: ozaki-r
Date: Thu May 26 05:01:12 UTC 2016
Modified Files:
src/sys/dev/ic: ath.c athn.c atw.c awi.c bwi.c malo.c rt2560.c rt2661.c
rt2860.c wi.c
src/sys/dev/pci: if_iwm.c if_iwn.c 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
Log Message:
Use M_GETCTX
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/ic/ath.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/athn.c
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/ic/atw.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/ic/awi.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/bwi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/malo.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/rt2560.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/rt2661.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/rt2860.c
cvs rdiff -u -r1.237 -r1.238 src/sys/dev/ic/wi.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/if_iwm.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_rtwn.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/if_zyd.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/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.119 src/sys/dev/ic/ath.c:1.120
--- src/sys/dev/ic/ath.c:1.119 Fri Apr 8 14:52:56 2016
+++ src/sys/dev/ic/ath.c Thu May 26 05:01:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.119 2016/04/08 14:52:56 roy Exp $ */
+/* $NetBSD: ath.c,v 1.120 2016/05/26 05:01:11 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.119 2016/04/08 14:52:56 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.120 2016/05/26 05:01:11 ozaki-r Exp $");
#endif
/*
@@ -1399,7 +1399,7 @@ ath_start(struct ifnet *ifp)
* tags which we consider too expensive to use)
* to pass it along.
*/
- ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
wh = mtod(m, struct ieee80211_frame *);
Index: src/sys/dev/ic/athn.c
diff -u src/sys/dev/ic/athn.c:1.12 src/sys/dev/ic/athn.c:1.13
--- src/sys/dev/ic/athn.c:1.12 Tue Nov 17 16:37:22 2015
+++ src/sys/dev/ic/athn.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: athn.c,v 1.12 2015/11/17 16:37:22 jakllsch Exp $ */
+/* $NetBSD: athn.c,v 1.13 2016/05/26 05:01:12 ozaki-r Exp $ */
/* $OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.12 2015/11/17 16:37:22 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.13 2016/05/26 05:01:12 ozaki-r Exp $");
#ifndef _MODULE
#include "athn_usb.h" /* for NATHN_USB */
@@ -2623,7 +2623,7 @@ athn_start(struct ifnet *ifp)
/* Send pending management frames first. */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
goto sendit;
}
if (ic->ic_state != IEEE80211_S_RUN)
Index: src/sys/dev/ic/atw.c
diff -u src/sys/dev/ic/atw.c:1.157 src/sys/dev/ic/atw.c:1.158
--- src/sys/dev/ic/atw.c:1.157 Tue Jan 26 16:00:12 2016
+++ src/sys/dev/ic/atw.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: atw.c,v 1.157 2016/01/26 16:00:12 christos Exp $ */
+/* $NetBSD: atw.c,v 1.158 2016/05/26 05:01:12 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.157 2016/01/26 16:00:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.158 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
@@ -3491,7 +3491,7 @@ atw_start(struct ifnet *ifp)
*/
IF_DEQUEUE(&ic->ic_mgtq, m0);
if (m0 != NULL) {
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
} else if (ic->ic_state != IEEE80211_S_RUN)
break; /* send no data until associated */
Index: src/sys/dev/ic/awi.c
diff -u src/sys/dev/ic/awi.c:1.88 src/sys/dev/ic/awi.c:1.89
--- src/sys/dev/ic/awi.c:1.88 Sat Oct 27 17:18:19 2012
+++ src/sys/dev/ic/awi.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: awi.c,v 1.88 2012/10/27 17:18:19 chs Exp $ */
+/* $NetBSD: awi.c,v 1.89 2016/05/26 05:01:12 ozaki-r Exp $ */
/*-
* Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.88 2012/10/27 17:18:19 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.89 2016/05/26 05:01:12 ozaki-r Exp $");
#include "opt_inet.h"
@@ -668,7 +668,7 @@ awi_start(struct ifnet *ifp)
break;
}
IF_DEQUEUE(&ic->ic_mgtq, m0);
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
} else {
if (ic->ic_state != IEEE80211_S_RUN)
break;
Index: src/sys/dev/ic/bwi.c
diff -u src/sys/dev/ic/bwi.c:1.27 src/sys/dev/ic/bwi.c:1.28
--- src/sys/dev/ic/bwi.c:1.27 Wed Mar 2 19:26:15 2016
+++ src/sys/dev/ic/bwi.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bwi.c,v 1.27 2016/03/02 19:26:15 christos Exp $ */
+/* $NetBSD: bwi.c,v 1.28 2016/05/26 05:01:12 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.27 2016/03/02 19:26:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.28 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -7365,7 +7365,7 @@ bwi_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
mgt_pkt = 1;
Index: src/sys/dev/ic/malo.c
diff -u src/sys/dev/ic/malo.c:1.5 src/sys/dev/ic/malo.c:1.6
--- src/sys/dev/ic/malo.c:1.5 Fri Mar 11 22:39:01 2016
+++ src/sys/dev/ic/malo.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: malo.c,v 1.5 2016/03/11 22:39:01 macallan Exp $ */
+/* $NetBSD: malo.c,v 1.6 2016/05/26 05:01:12 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.5 2016/03/11 22:39:01 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.6 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -997,7 +997,7 @@ malo_start(struct ifnet *ifp)
}
IF_DEQUEUE(&ic->ic_mgtq, m0);
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m0);
Index: src/sys/dev/ic/rt2560.c
diff -u src/sys/dev/ic/rt2560.c:1.25 src/sys/dev/ic/rt2560.c:1.26
--- src/sys/dev/ic/rt2560.c:1.25 Sat Feb 18 13:38:35 2012
+++ src/sys/dev/ic/rt2560.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2560.c,v 1.25 2012/02/18 13:38:35 drochner Exp $ */
+/* $NetBSD: rt2560.c,v 1.26 2016/05/26 05:01:12 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.25 2012/02/18 13:38:35 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.26 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
@@ -2072,7 +2072,7 @@ rt2560_start(struct ifnet *ifp)
if (m0 == NULL)
break;
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m0);
if (rt2560_tx_mgt(sc, m0, ni) != 0)
Index: src/sys/dev/ic/rt2661.c
diff -u src/sys/dev/ic/rt2661.c:1.30 src/sys/dev/ic/rt2661.c:1.31
--- src/sys/dev/ic/rt2661.c:1.30 Wed Jan 7 07:05:48 2015
+++ src/sys/dev/ic/rt2661.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661.c,v 1.30 2015/01/07 07:05:48 ozaki-r Exp $ */
+/* $NetBSD: rt2661.c,v 1.31 2016/05/26 05:01:12 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.30 2015/01/07 07:05:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.31 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
@@ -1806,7 +1806,7 @@ rt2661_start(struct ifnet *ifp)
if (m0 == NULL)
break;
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m0);
if (rt2661_tx_mgt(sc, m0, ni) != 0)
Index: src/sys/dev/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.8 src/sys/dev/ic/rt2860.c:1.9
--- src/sys/dev/ic/rt2860.c:1.8 Fri May 6 18:07:17 2016
+++ src/sys/dev/ic/rt2860.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.8 2016/05/06 18:07:17 christos Exp $ */
+/* $NetBSD: rt2860.c,v 1.9 2016/05/26 05:01:12 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.8 2016/05/06 18:07:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.9 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1733,7 +1733,7 @@ rt2860_start(struct ifnet *ifp)
/* send pending management frames first */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
goto sendit;
}
Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.237 src/sys/dev/ic/wi.c:1.238
--- src/sys/dev/ic/wi.c:1.237 Tue Feb 25 18:30:09 2014
+++ src/sys/dev/ic/wi.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.237 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: wi.c,v 1.238 2016/05/26 05:01:12 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.237 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.238 2016/05/26 05:01:12 ozaki-r Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -1106,7 +1106,7 @@ wi_start(struct ifnet *ifp)
(void *)&frmhdr.wi_ehdr);
frmhdr.wi_ehdr.ether_type = 0;
wh = mtod(m0, struct ieee80211_frame *);
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
} else if (ic->ic_state == IEEE80211_S_RUN) {
IFQ_POLL(&ifp->if_snd, m0);
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.40 src/sys/dev/pci/if_iwm.c:1.41
--- src/sys/dev/pci/if_iwm.c:1.40 Tue Feb 9 08:32:11 2016
+++ src/sys/dev/pci/if_iwm.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.40 2016/02/09 08:32:11 ozaki-r Exp $ */
+/* $NetBSD: if_iwm.c,v 1.41 2016/05/26 05:01:12 ozaki-r Exp $ */
/* OpenBSD: if_iwm.c,v 1.41 2015/05/22 06:50:54 kettenis Exp */
/*
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.40 2016/02/09 08:32:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.41 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -5793,7 +5793,7 @@ iwm_start(struct ifnet *ifp)
/* need to send management frames even if we're not RUNning */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
ac = 0;
goto sendit;
}
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.76 src/sys/dev/pci/if_iwn.c:1.77
--- src/sys/dev/pci/if_iwn.c:1.76 Tue Sep 22 23:23:06 2015
+++ src/sys/dev/pci/if_iwn.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.76 2015/09/22 23:23:06 nonaka Exp $ */
+/* $NetBSD: if_iwn.c,v 1.77 2016/05/26 05:01:12 ozaki-r Exp $ */
/* $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.76 2015/09/22 23:23:06 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.77 2016/05/26 05:01:12 ozaki-r Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -3100,7 +3100,7 @@ iwn_start(struct ifnet *ifp)
/* Send pending management frames first. */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
ac = 0;
goto sendit;
}
Index: src/sys/dev/pci/if_rtwn.c
diff -u src/sys/dev/pci/if_rtwn.c:1.5 src/sys/dev/pci/if_rtwn.c:1.6
--- src/sys/dev/pci/if_rtwn.c:1.5 Tue Feb 9 08:32:11 2016
+++ src/sys/dev/pci/if_rtwn.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtwn.c,v 1.5 2016/02/09 08:32:11 ozaki-r Exp $ */
+/* $NetBSD: if_rtwn.c,v 1.6 2016/05/26 05:01:12 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.5 2016/02/09 08:32:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.6 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2060,7 +2060,7 @@ rtwn_start(struct ifnet *ifp)
/* Send pending management frames first. */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
goto sendit;
}
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.71 src/sys/dev/pci/if_wpi.c:1.72
--- src/sys/dev/pci/if_wpi.c:1.71 Fri Jan 9 15:25:23 2015
+++ src/sys/dev/pci/if_wpi.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.71 2015/01/09 15:25:23 bouyer Exp $ */
+/* $NetBSD: if_wpi.c,v 1.72 2016/05/26 05:01:12 ozaki-r Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.71 2015/01/09 15:25:23 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.72 2016/05/26 05:01:12 ozaki-r Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -2058,7 +2058,7 @@ wpi_start(struct ifnet *ifp)
IF_DEQUEUE(&ic->ic_mgtq, m0);
if (m0 != NULL) {
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
/* management frames go into ring 0 */
Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.9 src/sys/dev/usb/if_athn_usb.c:1.10
--- src/sys/dev/usb/if_athn_usb.c:1.9 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_athn_usb.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.9 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.10 2016/05/26 05:01:12 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.9 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.10 2016/05/26 05:01:12 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2427,7 +2427,7 @@ athn_usb_start(struct ifnet *ifp)
/* Send pending management frames first. */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
goto sendit;
}
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.51 src/sys/dev/usb/if_atu.c:1.52
--- src/sys/dev/usb/if_atu.c:1.51 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_atu.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.51 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_atu.c,v 1.52 2016/05/26 05:01:12 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.51 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.52 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1939,7 +1939,7 @@ atu_start(struct ifnet *ifp)
* tags which we consider too expensive to use)
* to pass it along.
*/
- ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
/* sc->sc_stats.ast_tx_mgmt++; */
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.26 src/sys/dev/usb/if_otus.c:1.27
--- src/sys/dev/usb/if_otus.c:1.26 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_otus.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.26 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_otus.c,v 1.27 2016/05/26 05:01:12 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.26 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.27 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2091,7 +2091,7 @@ otus_start(struct ifnet *ifp)
/* Send pending management frames first. */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
goto sendit;
}
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.52 src/sys/dev/usb/if_rum.c:1.53
--- src/sys/dev/usb/if_rum.c:1.52 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_rum.c Thu May 26 05:01:12 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.52 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_rum.c,v 1.53 2016/05/26 05:01:12 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.52 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.53 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1268,7 +1268,7 @@ rum_start(struct ifnet *ifp)
}
IF_DEQUEUE(&ic->ic_mgtq, m0);
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m0);
if (rum_tx_data(sc, m0, ni) != 0)
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.12 src/sys/dev/usb/if_run.c:1.13
--- src/sys/dev/usb/if_run.c:1.12 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_run.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.12 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_run.c,v 1.13 2016/05/26 05:01:12 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.12 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.13 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2379,7 +2379,7 @@ run_start(struct ifnet *ifp)
/* send pending management frames first */
IF_DEQUEUE(&ic->ic_mgtq, m);
if (m != NULL) {
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
goto sendit;
}
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.14 src/sys/dev/usb/if_upgt.c:1.15
--- src/sys/dev/usb/if_upgt.c:1.14 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_upgt.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.14 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_upgt.c,v 1.15 2016/05/26 05:01:12 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.14 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.15 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -1460,7 +1460,7 @@ upgt_start(struct ifnet *ifp)
/* management frame */
IF_DEQUEUE(&ic->ic_mgtq, m);
- ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m);
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.46 src/sys/dev/usb/if_ural.c:1.47
--- src/sys/dev/usb/if_ural.c:1.46 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_ural.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.46 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_ural.c,v 1.47 2016/05/26 05:01:12 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.46 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.47 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1361,7 +1361,7 @@ ural_start(struct ifnet *ifp)
}
IF_DEQUEUE(&ic->ic_mgtq, m0);
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m0);
if (ural_tx_mgt(sc, m0, ni) != 0)
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.7 src/sys/dev/usb/if_urtw.c:1.8
--- src/sys/dev/usb/if_urtw.c:1.7 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_urtw.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.7 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_urtw.c,v 1.8 2016/05/26 05:01:12 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.7 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.8 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2433,7 +2433,7 @@ urtw_start(struct ifnet *ifp)
break;
}
IF_DEQUEUE(&ic->ic_mgtq, m0);
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m0);
if (urtw_tx_start(sc, ni, m0, URTW_PRIORITY_NORMAL)
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.42 src/sys/dev/usb/if_urtwn.c:1.43
--- src/sys/dev/usb/if_urtwn.c:1.42 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/if_urtwn.c Thu May 26 05:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.42 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.43 2016/05/26 05:01:12 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.42 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.43 2016/05/26 05:01:12 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2661,7 +2661,7 @@ urtwn_start(struct ifnet *ifp)
return;
}
IF_DEQUEUE(&ic->ic_mgtq, m);
- ni = (void *)m->m_pkthdr.rcvif;
+ ni = M_GETCTX(m, struct ieee80211_node *);
m->m_pkthdr.rcvif = NULL;
goto sendit;
}
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.38 src/sys/dev/usb/if_zyd.c:1.39
--- src/sys/dev/usb/if_zyd.c:1.38 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/if_zyd.c Thu May 26 05:01:12 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.38 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: if_zyd.c,v 1.39 2016/05/26 05:01:12 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.38 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.39 2016/05/26 05:01:12 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2326,7 +2326,7 @@ zyd_start(struct ifnet *ifp)
}
IF_DEQUEUE(&ic->ic_mgtq, m0);
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
+ ni = M_GETCTX(m0, struct ieee80211_node *);
m0->m_pkthdr.rcvif = NULL;
bpf_mtap3(ic->ic_rawbpf, m0);
if (zyd_tx_mgt(sc, m0, ni) != 0)
