Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Introduce m_set_rcvif and m_reset_rcvif
details: https://anonhg.NetBSD.org/src/rev/c2c8ef121618
branches: trunk
changeset: 815980:c2c8ef121618
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Fri Jun 10 13:27:10 2016 +0000
description:
Introduce m_set_rcvif and m_reset_rcvif
The API is used to set (or reset) a received interface of a mbuf.
They are counterpart of m_get_rcvif, which will come in another
commit, hide internal of rcvif operation, and reduce the diff of
the upcoming change.
No functional change.
diffstat:
sys/arch/acorn26/ioc/if_eca.c | 6 +++---
sys/arch/acorn32/podulebus/if_ie.c | 6 +++---
sys/arch/amiga/dev/if_es.c | 6 +++---
sys/arch/amiga/dev/if_qn.c | 6 +++---
sys/arch/arm/allwinner/awin_eth.c | 4 ++--
sys/arch/arm/at91/at91emac.c | 8 ++++----
sys/arch/arm/broadcom/bcm53xx_eth.c | 4 ++--
sys/arch/arm/ep93xx/epe.c | 6 +++---
sys/arch/arm/gemini/gemini_gmac.c | 6 +++---
sys/arch/arm/gemini/if_gpn.c | 6 +++---
sys/arch/arm/imx/if_enet.c | 6 +++---
sys/arch/arm/omap/if_cpsw.c | 6 +++---
sys/arch/arm/omap/omapl1x_emac.c | 4 ++--
sys/arch/arm/rockchip/rockchip_emac.c | 6 +++---
sys/arch/arm/xscale/ixp425_if_npe.c | 6 +++---
sys/arch/emips/ebus/if_le_ebus.c | 10 +++++-----
sys/arch/evbppc/virtex/dev/if_temac.c | 6 +++---
sys/arch/mac68k/dev/if_mc.c | 6 +++---
sys/arch/mac68k/nubus/if_netdock_nubus.c | 6 +++---
sys/arch/macppc/dev/am79c950.c | 6 +++---
sys/arch/macppc/dev/if_bm.c | 6 +++---
sys/arch/macppc/dev/if_gm.c | 6 +++---
sys/arch/mips/adm5120/dev/if_admsw.c | 6 +++---
sys/arch/mips/alchemy/dev/if_aumac.c | 6 +++---
sys/arch/mips/atheros/dev/if_ae.c | 6 +++---
sys/arch/mips/cavium/dev/if_cnmac.c | 6 +++---
sys/arch/mips/ralink/ralink_eth.c | 6 +++---
sys/arch/mips/sibyte/dev/sbmac.c | 6 +++---
sys/arch/newsmips/apbus/if_sn.c | 6 +++---
sys/arch/next68k/dev/if_xe.c | 6 +++---
sys/arch/next68k/dev/mb8795.c | 6 +++---
sys/arch/playstation2/dev/if_smap.c | 6 +++---
sys/arch/powerpc/booke/dev/pq3etsec.c | 6 +++---
sys/arch/powerpc/ibm4xx/dev/if_emac.c | 6 +++---
sys/arch/sgimips/hpc/if_sq.c | 6 +++---
sys/arch/sgimips/mace/if_mec.c | 6 +++---
sys/arch/sun2/dev/if_ec.c | 6 +++---
sys/arch/sun3/dev/if_ie.c | 6 +++---
sys/arch/usermode/dev/if_veth.c | 6 +++---
sys/arch/x86/pci/if_vmx.c | 6 +++---
sys/arch/xen/xen/if_xennet_xenbus.c | 6 +++---
sys/arch/xen/xen/xennetback_xenbus.c | 6 +++---
sys/dev/bi/if_ni.c | 6 +++---
sys/dev/cadence/if_cemac.c | 6 +++---
sys/dev/ic/aic6915.c | 6 +++---
sys/dev/ic/an.c | 6 +++---
sys/dev/ic/arn5008.c | 8 ++++----
sys/dev/ic/arn9003.c | 8 ++++----
sys/dev/ic/ath.c | 6 +++---
sys/dev/ic/atw.c | 6 +++---
sys/dev/ic/awi.c | 6 +++---
sys/dev/ic/bwi.c | 6 +++---
sys/dev/ic/cs89x0.c | 8 ++++----
sys/dev/ic/dm9000.c | 4 ++--
sys/dev/ic/dp8390.c | 6 +++---
sys/dev/ic/dp83932.c | 6 +++---
sys/dev/ic/dwc_gmac.c | 6 +++---
sys/dev/ic/elink3.c | 6 +++---
sys/dev/ic/elinkxl.c | 6 +++---
sys/dev/ic/gem.c | 6 +++---
sys/dev/ic/hd64570.c | 10 +++++-----
sys/dev/ic/hme.c | 6 +++---
sys/dev/ic/i82557.c | 6 +++---
sys/dev/ic/i82586.c | 6 +++---
sys/dev/ic/i82596.c | 6 +++---
sys/dev/ic/lan9118.c | 6 +++---
sys/dev/ic/lance.c | 6 +++---
sys/dev/ic/lemac.c | 6 +++---
sys/dev/ic/malo.c | 6 +++---
sys/dev/ic/mb86950.c | 6 +++---
sys/dev/ic/mb86960.c | 6 +++---
sys/dev/ic/midway.c | 8 ++++----
sys/dev/ic/mtd803.c | 6 +++---
sys/dev/ic/pdq_ifsubr.c | 6 +++---
sys/dev/ic/rrunner.c | 6 +++---
sys/dev/ic/rt2560.c | 6 +++---
sys/dev/ic/rt2661.c | 6 +++---
sys/dev/ic/rtl8169.c | 6 +++---
sys/dev/ic/rtl81x9.c | 6 +++---
sys/dev/ic/rtw.c | 6 +++---
sys/dev/ic/seeq8005.c | 6 +++---
sys/dev/ic/sgec.c | 6 +++---
sys/dev/ic/smc83c170.c | 6 +++---
sys/dev/ic/smc90cx6.c | 6 +++---
sys/dev/ic/smc91cxx.c | 6 +++---
sys/dev/ic/tropic.c | 6 +++---
sys/dev/ic/tulip.c | 6 +++---
sys/dev/ic/wi.c | 6 +++---
sys/dev/ieee1394/if_fwip.c | 8 ++++----
sys/dev/if_ndis/if_ndis.c | 6 +++---
sys/dev/isa/cs89x0isa.c | 6 +++---
sys/dev/isa/if_eg.c | 6 +++---
sys/dev/isa/if_el.c | 6 +++---
sys/dev/isa/if_iy.c | 6 +++---
sys/dev/kttcp.c | 6 +++---
sys/dev/marvell/if_gfe.c | 6 +++---
sys/dev/marvell/if_mvgbe.c | 6 +++---
sys/dev/marvell/if_mvxpe.c | 6 +++---
sys/dev/ofw/ofnet.c | 6 +++---
sys/dev/pci/cxgb/cxgb_sge.c | 4 ++--
sys/dev/pci/if_age.c | 6 +++---
sys/dev/pci/if_alc.c | 4 ++--
sys/dev/pci/if_bce.c | 6 +++---
sys/dev/pci/if_bge.c | 6 +++---
sys/dev/pci/if_bnx.c | 6 +++---
sys/dev/pci/if_de.c | 8 ++++----
sys/dev/pci/if_dge.c | 6 +++---
sys/dev/pci/if_et.c | 6 +++---
sys/dev/pci/if_ipw.c | 6 +++---
sys/dev/pci/if_iwi.c | 6 +++---
sys/dev/pci/if_iwm.c | 6 +++---
sys/dev/pci/if_iwn.c | 6 +++---
sys/dev/pci/if_jme.c | 6 +++---
sys/dev/pci/if_kse.c | 6 +++---
sys/dev/pci/if_lii.c | 6 +++---
sys/dev/pci/if_lmc.c | 10 +++++-----
sys/dev/pci/if_msk.c | 6 +++---
sys/dev/pci/if_nfe.c | 6 +++---
sys/dev/pci/if_pcn.c | 6 +++---
sys/dev/pci/if_rtwn.c | 6 +++---
sys/dev/pci/if_sip.c | 8 ++++----
sys/dev/pci/if_sk.c | 6 +++---
sys/dev/pci/if_ste.c | 6 +++---
sys/dev/pci/if_stge.c | 6 +++---
sys/dev/pci/if_ti.c | 6 +++---
sys/dev/pci/if_tl.c | 6 +++---
sys/dev/pci/if_txp.c | 10 +++++-----
sys/dev/pci/if_vge.c | 6 +++---
sys/dev/pci/if_vioif.c | 6 +++---
sys/dev/pci/if_vr.c | 6 +++---
sys/dev/pci/if_vte.c | 6 +++---
sys/dev/pci/if_wm.c | 6 +++---
sys/dev/pci/if_wpi.c | 6 +++---
sys/dev/pci/if_xge.c | 6 +++---
sys/dev/pci/ixgbe/ixgbe.c | 4 ++--
sys/dev/pci/ixgbe/ixv.c | 4 ++--
sys/dev/pcmcia/if_cnw.c | 6 +++---
sys/dev/pcmcia/if_ray.c | 6 +++---
sys/dev/pcmcia/if_xi.c | 6 +++---
sys/dev/qbus/if_qe.c | 6 +++---
sys/dev/qbus/if_uba.c | 6 +++---
sys/dev/sbus/be.c | 6 +++---
sys/dev/sbus/qe.c | 6 +++---
sys/dev/scsipi/if_se.c | 6 +++---
sys/dev/usb/if_athn_usb.c | 6 +++---
sys/dev/usb/if_atu.c | 6 +++---
sys/dev/usb/if_aue.c | 6 +++---
sys/dev/usb/if_axe.c | 6 +++---
sys/dev/usb/if_axen.c | 6 +++---
sys/dev/usb/if_cdce.c | 6 +++---
sys/dev/usb/if_cue.c | 6 +++---
sys/dev/usb/if_kue.c | 6 +++---
sys/dev/usb/if_otus.c | 6 +++---
sys/dev/usb/if_rum.c | 6 +++---
sys/dev/usb/if_run.c | 6 +++---
sys/dev/usb/if_smsc.c | 4 ++--
sys/dev/usb/if_udav.c | 6 +++---
sys/dev/usb/if_upl.c | 6 +++---
sys/dev/usb/if_ural.c | 6 +++---
sys/dev/usb/if_url.c | 6 +++---
sys/dev/usb/if_urndis.c | 6 +++---
sys/dev/usb/if_urtw.c | 6 +++---
sys/dev/usb/if_urtwn.c | 6 +++---
sys/dev/usb/if_zyd.c | 6 +++---
sys/dev/usb/uhso.c | 6 +++---
sys/dist/pf/net/if_pfsync.c | 6 +++---
sys/dist/pf/net/pf.c | 6 +++---
sys/external/bsd/ipf/netinet/ip_compat.h | 6 +++---
sys/external/bsd/ipf/netinet/ip_fil_netbsd.c | 14 +++++++-------
sys/fs/nfs/common/krpc_subr.c | 4 ++--
sys/kern/subr_tftproot.c | 6 +++---
sys/kern/uipc_mbuf.c | 8 ++++----
sys/kern/uipc_socket.c | 6 +++---
sys/net/agr/if_agr.c | 6 +++---
sys/net/bpf.c | 8 ++++----
sys/net/bridgestp.c | 8 ++++----
sys/net/if_atmsubr.c | 6 +++---
sys/net/if_bridge.c | 11 ++++++-----
sys/net/if_faith.c | 6 +++---
sys/net/if_gif.c | 6 +++---
sys/net/if_gre.c | 6 +++---
sys/net/if_loop.c | 6 +++---
sys/net/if_ppp.c | 6 +++---
sys/net/if_pppoe.c | 8 ++++----
sys/net/if_sl.c | 6 +++---
sys/net/if_spppsubr.c | 10 +++++-----
sys/net/if_stf.c | 6 +++---
sys/net/if_strip.c | 6 +++---
sys/net/if_tap.c | 6 +++---
sys/net/if_tun.c | 6 +++---
sys/net/if_vlan.c | 6 +++---
sys/net/ppp_tty.c | 6 +++---
sys/net/rtsock.c | 6 +++---
sys/netinet/dccp_usrreq.c | 6 +++---
sys/netinet/ip_carp.c | 12 ++++++------
sys/netinet/ip_etherip.c | 6 +++---
sys/netinet/ip_icmp.c | 6 +++---
sys/netinet/ip_mroute.c | 6 +++---
sys/netinet/ip_output.c | 6 +++---
sys/netinet/sctp_output.c | 26 +++++++++++++-------------
sys/netinet/sctputil.c | 18 +++++++++---------
sys/netinet/tcp_input.c | 6 +++---
sys/netinet/tcp_output.c | 6 +++---
sys/netinet/tcp_subr.c | 6 +++---
sys/netinet6/icmp6.c | 10 +++++-----
sys/netinet6/ip6_etherip.c | 6 +++---
sys/netinet6/ip6_output.c | 8 ++++----
sys/netinet6/mld6.c | 6 +++---
sys/netinet6/nd6_nbr.c | 8 ++++----
sys/netipsec/keysock.c | 6 +++---
sys/netisdn/i4b_ipr.c | 6 +++---
sys/netisdn/i4b_isppp.c | 6 +++---
sys/netmpls/mpls_ttl.c | 6 +++---
sys/netnatm/natm.c | 8 ++++----
sys/nfs/krpc_subr.c | 6 +++---
sys/nfs/nfs_bootdhcp.c | 6 +++---
sys/nfs/nfs_subs.c | 6 +++---
sys/nfs/nfs_syscalls.c | 6 +++---
sys/rump/net/lib/libshmif/if_shmem.c | 6 +++---
sys/rump/net/lib/libvirtif/if_virt.c | 6 +++---
sys/sys/mbuf.h | 18 ++++++++++++++++--
221 files changed, 719 insertions(+), 704 deletions(-)
diffs (truncated from 6360 to 300 lines):
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/acorn26/ioc/if_eca.c
--- a/sys/arch/acorn26/ioc/if_eca.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/acorn26/ioc/if_eca.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eca.c,v 1.13 2012/05/11 15:39:18 skrll Exp $ */
+/* $NetBSD: if_eca.c,v 1.14 2016/06/10 13:27:10 ozaki-r Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -29,7 +29,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.13 2012/05/11 15:39:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.14 2016/06/10 13:27:10 ozaki-r Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
@@ -480,7 +480,7 @@
m_freem(mtail->m_next);
mtail->m_next = NULL;
/* Set up the header of the chain. */
- m->m_pkthdr.rcvif = ifp;
+ m_set_rcvif(m, ifp);
m->m_pkthdr.len = 0;
for (n = m; n != NULL; n = n->m_next)
m->m_pkthdr.len += n->m_len;
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.36 2016/02/09 08:32:07 ozaki-r Exp $ */
+/* $NetBSD: if_ie.c,v 1.37 2016/06/10 13:27:10 ozaki-r Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.36 2016/02/09 08:32:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.37 2016/06/10 13:27:10 ozaki-r Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -1102,7 +1102,7 @@
if ( m==0 )
return 0;
- m->m_pkthdr.rcvif = &sc->sc_ethercom.ec_if;
+ m_set_rcvif(m, &sc->sc_ethercom.ec_if);
m->m_pkthdr.len = totlen;
len = MHLEN;
top = 0;
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/amiga/dev/if_es.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.54 2016/02/09 08:32:07 ozaki-r Exp $ */
+/* $NetBSD: if_es.c,v 1.55 2016/06/10 13:27:10 ozaki-r Exp $ */
/*
* Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
#include "opt_ns.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.54 2016/02/09 08:32:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.55 2016/06/10 13:27:10 ozaki-r Exp $");
#include <sys/param.h>
@@ -663,7 +663,7 @@
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == NULL)
return;
- m->m_pkthdr.rcvif = ifp;
+ m_set_rcvif(m, ifp);
m->m_pkthdr.len = pktlen;
len = MHLEN;
top = NULL;
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/amiga/dev/if_qn.c
--- a/sys/arch/amiga/dev/if_qn.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/amiga/dev/if_qn.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.41 2016/02/09 08:32:07 ozaki-r Exp $ */
+/* $NetBSD: if_qn.c,v 1.42 2016/06/10 13:27:10 ozaki-r Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.41 2016/02/09 08:32:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.42 2016/06/10 13:27:10 ozaki-r Exp $");
#include "qn.h"
#if NQN > 0
@@ -540,7 +540,7 @@
if (len & 1)
len++;
- m->m_pkthdr.rcvif = &sc->sc_ethercom.ec_if;
+ m_set_rcvif(m, &sc->sc_ethercom.ec_if);
m->m_pkthdr.len = len;
m->m_len = 0;
head = m;
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/allwinner/awin_eth.c
--- a/sys/arch/arm/allwinner/awin_eth.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/allwinner/awin_eth.c Fri Jun 10 13:27:10 2016 +0000
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.10 2016/02/09 08:32:07 ozaki-r Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.11 2016/06/10 13:27:10 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -412,7 +412,7 @@
m->m_data += 2;
m->m_len = rxlen;
m->m_pkthdr.len = rxlen;
- m->m_pkthdr.rcvif = &sc->sc_ec.ec_if;
+ m_set_rcvif(m, &sc->sc_ec.ec_if);
return m;
}
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/at91/at91emac.c
--- a/sys/arch/arm/at91/at91emac.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/at91/at91emac.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.16 2016/02/09 08:32:07 ozaki-r Exp $ */
-/* $NetBSD: at91emac.c,v 1.16 2016/02/09 08:32:07 ozaki-r Exp $ */
+/* $Id: at91emac.c,v 1.17 2016/06/10 13:27:10 ozaki-r Exp $ */
+/* $NetBSD: at91emac.c,v 1.17 2016/06/10 13:27:10 ozaki-r Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.16 2016/02/09 08:32:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.17 2016/06/10 13:27:10 ozaki-r Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -279,7 +279,7 @@
MCLBYTES, BUS_DMASYNC_POSTREAD);
bus_dmamap_unload(sc->sc_dmat,
sc->rxq[bi].m_dmamap);
- sc->rxq[bi].m->m_pkthdr.rcvif = ifp;
+ m_set_rcvif(sc->rxq[bi].m, ifp);
sc->rxq[bi].m->m_pkthdr.len =
sc->rxq[bi].m->m_len = fl;
bpf_mtap(ifp, sc->rxq[bi].m);
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/broadcom/bcm53xx_eth.c
--- a/sys/arch/arm/broadcom/bcm53xx_eth.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_eth.c Fri Jun 10 13:27:10 2016 +0000
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.27 2016/02/09 08:32:08 ozaki-r Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.28 2016/06/10 13:27:11 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1011,7 +1011,7 @@
|| *(uint32_t *)&m->m_data[2] != sc->sc_macaddr[1])) {
m->m_flags |= M_PROMISC;
}
- m->m_pkthdr.rcvif = ifp;
+ m_set_rcvif(m, ifp);
ifp->if_ipackets++;
ifp->if_ibytes += m->m_pkthdr.len;
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.33 2016/02/09 08:32:08 ozaki-r Exp $ */
+/* $NetBSD: epe.c,v 1.34 2016/06/10 13:27:11 ozaki-r Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.33 2016/02/09 08:32:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.34 2016/06/10 13:27:11 ozaki-r Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -227,7 +227,7 @@
if (m != NULL && (m->m_flags & M_EXT)) {
bus_dmamap_unload(sc->sc_dmat,
sc->rxq[bi].m_dmamap);
- sc->rxq[bi].m->m_pkthdr.rcvif = ifp;
+ m_set_rcvif(sc->rxq[bi].m, ifp);
sc->rxq[bi].m->m_pkthdr.len =
sc->rxq[bi].m->m_len = fl;
bpf_mtap(ifp, sc->rxq[bi].m);
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/gemini/gemini_gmac.c
--- a/sys/arch/arm/gemini/gemini_gmac.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/gemini/gemini_gmac.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.8 2016/02/09 08:32:08 ozaki-r Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.9 2016/06/10 13:27:11 ozaki-r Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -49,7 +49,7 @@
#include <sys/gpio.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.8 2016/02/09 08:32:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.9 2016/06/10 13:27:11 ozaki-r Exp $");
#define SWFREEQ_DESCS 256 /* one page worth */
#define HWFREEQ_DESCS 256 /* one page worth */
@@ -847,7 +847,7 @@
* Now get the whole chain.
*/
m = hwq->hwq_rxmbuf;
- m->m_pkthdr.rcvif = ifp; /* set receive interface */
+ m_set_rcvif(m, ifp); /* set receive interface */
ifp->if_ipackets++;
ifp->if_ibytes += m->m_pkthdr.len;
switch (DESC0_RXSTS_GET(d->d_desc0)) {
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/gemini/if_gpn.c
--- a/sys/arch/arm/gemini/if_gpn.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/gemini/if_gpn.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gpn.c,v 1.5 2016/02/09 08:32:08 ozaki-r Exp $ */
+/* $NetBSD: if_gpn.c,v 1.6 2016/06/10 13:27:11 ozaki-r Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
#include "opt_gemini.h"
-__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.5 2016/02/09 08:32:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.6 2016/06/10 13:27:11 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -298,7 +298,7 @@
struct mbuf *m;
m = sc->sc_rxmbuf;
sc->sc_rxmbuf = NULL;
- m->m_pkthdr.rcvif = ifp;
+ m_set_rcvif(m, ifp);
KASSERT(((m->m_pkthdr.len + 63) >> 6) == gd->gd_pktlen64);
ifp->if_ipackets++;
ifp->if_ibytes += m->m_pkthdr.len;
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/imx/if_enet.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet.c,v 1.6 2016/05/17 06:44:45 ryo Exp $ */
+/* $NetBSD: if_enet.c,v 1.7 2016/06/10 13:27:11 ozaki-r Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.6 2016/05/17 06:44:45 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.7 2016/06/10 13:27:11 ozaki-r Exp $");
#include "vlan.h"
@@ -641,7 +641,7 @@
} else {
/* packet receive ok */
ifp->if_ipackets++;
- m0->m_pkthdr.rcvif = ifp;
+ m_set_rcvif(m0, ifp);
m0->m_pkthdr.len = amount;
bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
diff -r 3e8dbcf9624f -r c2c8ef121618 sys/arch/arm/omap/if_cpsw.c
--- a/sys/arch/arm/omap/if_cpsw.c Fri Jun 10 08:59:26 2016 +0000
+++ b/sys/arch/arm/omap/if_cpsw.c Fri Jun 10 13:27:10 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.13 2016/02/09 08:32:08 ozaki-r Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.14 2016/06/10 13:27:11 ozaki-r Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
Home |
Main Index |
Thread Index |
Old Index