Module Name: src
Committed By: ozaki-r
Date: Thu Apr 28 00:16:57 UTC 2016
Modified Files:
src/sys/dev/ic: hd64570.c
src/sys/dev/pci: if_lmc.c if_lmc.h
src/sys/dev/usb: if_upl.c uhso.c
src/sys/dist/pf/net: if_pflog.c if_pfsync.c
src/sys/net: if.c if.h if_atm.h if_atmsubr.c if_bridge.c if_bridgevar.h
if_ethersubr.c if_faith.c if_fddisubr.c if_gif.c if_gif.h if_gre.c
if_hippisubr.c if_ieee1394subr.c if_loop.c if_mpls.c if_ppp.c
if_pppvar.h if_sl.c if_spppsubr.c if_srt.c if_stf.c if_strip.c
if_tokensubr.c if_tun.c route.c route.h
src/sys/netinet: if_atm.c if_atm.h ip_carp.c ip_carp.h ip_output.c
ip_var.h
src/sys/netisdn: i4b_ipr.c
Log Message:
Constify rtentry of if_output
We no longer need to change rtentry below if_output.
The change makes it clear where rtentries are changed (or not)
and helps forthcoming locking (os psrefing) rtentries.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_lmc.h
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dist/pf/net/if_pflog.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.330 -r1.331 src/sys/net/if.c
cvs rdiff -u -r1.201 -r1.202 src/sys/net/if.h
cvs rdiff -u -r1.20 -r1.21 src/sys/net/if_atm.h src/sys/net/if_srt.c
cvs rdiff -u -r1.57 -r1.58 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.119 -r1.120 src/sys/net/if_bridge.c
cvs rdiff -u -r1.30 -r1.31 src/sys/net/if_bridgevar.h
cvs rdiff -u -r1.221 -r1.222 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.51 -r1.52 src/sys/net/if_faith.c
cvs rdiff -u -r1.98 -r1.99 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.107 -r1.108 src/sys/net/if_gif.c
cvs rdiff -u -r1.21 -r1.22 src/sys/net/if_gif.h src/sys/net/if_mpls.c
cvs rdiff -u -r1.167 -r1.168 src/sys/net/if_gre.c
cvs rdiff -u -r1.46 -r1.47 src/sys/net/if_hippisubr.c
cvs rdiff -u -r1.53 -r1.54 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.84 -r1.85 src/sys/net/if_loop.c
cvs rdiff -u -r1.150 -r1.151 src/sys/net/if_ppp.c
cvs rdiff -u -r1.27 -r1.28 src/sys/net/if_pppvar.h
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_sl.c
cvs rdiff -u -r1.140 -r1.141 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_stf.c
cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_strip.c
cvs rdiff -u -r1.75 -r1.76 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.124 -r1.125 src/sys/net/if_tun.c
cvs rdiff -u -r1.166 -r1.167 src/sys/net/route.c
cvs rdiff -u -r1.100 -r1.101 src/sys/net/route.h
cvs rdiff -u -r1.37 -r1.38 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet/if_atm.h
cvs rdiff -u -r1.63 -r1.64 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/ip_carp.h
cvs rdiff -u -r1.252 -r1.253 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.111 -r1.112 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.37 -r1.38 src/sys/netisdn/i4b_ipr.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/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.48 src/sys/dev/ic/hd64570.c:1.49
--- src/sys/dev/ic/hd64570.c:1.48 Wed Apr 20 09:01:03 2016
+++ src/sys/dev/ic/hd64570.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.48 2016/04/20 09:01:03 knakahara Exp $ */
+/* $NetBSD: hd64570.c,v 1.49 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.48 2016/04/20 09:01:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.49 2016/04/28 00:16:56 ozaki-r Exp $");
#include "opt_inet.h"
@@ -160,7 +160,7 @@ static void sca_port_up(sca_port_t *);
static void sca_port_down(sca_port_t *);
static int sca_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
static int sca_ioctl(struct ifnet *, u_long, void *);
static void sca_start(struct ifnet *);
static void sca_watchdog(struct ifnet *);
@@ -792,7 +792,7 @@ sca_output(
struct ifnet *ifp,
struct mbuf *m,
const struct sockaddr *dst,
- struct rtentry *rt0)
+ const struct rtentry *rt0)
{
struct hdlc_header *hdlc;
struct ifqueue *ifq = NULL;
Index: src/sys/dev/pci/if_lmc.c
diff -u src/sys/dev/pci/if_lmc.c:1.58 src/sys/dev/pci/if_lmc.c:1.59
--- src/sys/dev/pci/if_lmc.c:1.58 Wed Apr 20 09:01:03 2016
+++ src/sys/dev/pci/if_lmc.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.58 2016/04/20 09:01:03 knakahara Exp $ */
+/* $NetBSD: if_lmc.c,v 1.59 2016/04/28 00:16:56 ozaki-r Exp $ */
/*-
* Copyright (c) 2002-2006 David Boggs. <[email protected]>
@@ -74,7 +74,7 @@
*/
# include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.58 2016/04/20 09:01:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.59 2016/04/28 00:16:56 ozaki-r Exp $");
# include <sys/param.h> /* OS version */
# include "opt_inet.h" /* INET6, INET */
# include "opt_altq_enabled.h" /* ALTQ */
@@ -3355,7 +3355,7 @@ ifnet_input(struct ifnet *ifp, struct mb
*/
static int /* context: process */
ifnet_output(struct ifnet *ifp, struct mbuf *m,
- const struct sockaddr *dst, struct rtentry *rt)
+ const struct sockaddr *dst, const struct rtentry *rt)
{
softc_t *sc = IFP2SC(ifp);
int error = 0;
Index: src/sys/dev/pci/if_lmc.h
diff -u src/sys/dev/pci/if_lmc.h:1.22 src/sys/dev/pci/if_lmc.h:1.23
--- src/sys/dev/pci/if_lmc.h:1.22 Sun Sep 6 06:01:00 2015
+++ src/sys/dev/pci/if_lmc.h Thu Apr 28 00:16:56 2016
@@ -1,5 +1,5 @@
/*-
- * $NetBSD: if_lmc.h,v 1.22 2015/09/06 06:01:00 dholland Exp $
+ * $NetBSD: if_lmc.h,v 1.23 2016/04/28 00:16:56 ozaki-r Exp $
*
* Copyright (c) 2002-2006 David Boggs. ([email protected])
* All rights reserved.
@@ -1311,7 +1311,7 @@ static int rawip_detach(softc_t *);
#if IFNET
static void ifnet_input(struct ifnet *, struct mbuf *);
static int ifnet_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
static int ifnet_ioctl(struct ifnet *, u_long, void *);
static void ifnet_start(struct ifnet *);
static void ifnet_watchdog(struct ifnet *);
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.51 src/sys/dev/usb/if_upl.c:1.52
--- src/sys/dev/usb/if_upl.c:1.51 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_upl.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.51 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_upl.c,v 1.52 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.51 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.52 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -193,7 +193,7 @@ Static void upl_stop(struct upl_softc *)
Static void upl_watchdog(struct ifnet *);
Static int upl_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
Static void upl_input(struct ifnet *, struct mbuf *);
/*
@@ -985,7 +985,7 @@ upl_stop(struct upl_softc *sc)
Static int
upl_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt0)
+ const struct rtentry *rt0)
{
int s, len, error;
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.19 src/sys/dev/usb/uhso.c:1.20
--- src/sys/dev/usb/uhso.c:1.19 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uhso.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.19 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: uhso.c,v 1.20 2016/04/28 00:16:56 ozaki-r Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.19 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.20 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -421,7 +421,8 @@ Static int uhso_ifnet_ioctl(struct ifne
Static int uhso_ifnet_init(struct uhso_port *);
Static void uhso_ifnet_clean(struct uhso_port *);
Static void uhso_ifnet_start(struct ifnet *);
-Static int uhso_ifnet_output(struct ifnet *, struct mbuf *, const struct sockaddr *, struct rtentry *);
+Static int uhso_ifnet_output(struct ifnet *, struct mbuf *,
+ const struct sockaddr *, const struct rtentry *);
/*******************************************************************************
@@ -2339,7 +2340,7 @@ uhso_ifnet_start(struct ifnet *ifp)
Static int
uhso_ifnet_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt0)
+ const struct rtentry *rt0)
{
int error;
Index: src/sys/dist/pf/net/if_pflog.c
diff -u src/sys/dist/pf/net/if_pflog.c:1.19 src/sys/dist/pf/net/if_pflog.c:1.20
--- src/sys/dist/pf/net/if_pflog.c:1.19 Thu Aug 20 14:40:18 2015
+++ src/sys/dist/pf/net/if_pflog.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pflog.c,v 1.19 2015/08/20 14:40:18 christos Exp $ */
+/* $NetBSD: if_pflog.c,v 1.20 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $OpenBSD: if_pflog.c,v 1.24 2007/05/26 17:13:30 jason Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.19 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.20 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v
void pflogdetach(void);
#endif /* _MODULE */
int pflogoutput(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
int pflogioctl(struct ifnet *, u_long, void *);
void pflogstart(struct ifnet *);
int pflog_clone_create(struct if_clone *, int);
@@ -208,7 +208,7 @@ pflogstart(struct ifnet *ifp)
int
pflogoutput(struct ifnet *ifp, struct mbuf *m,
- const struct sockaddr *dst, struct rtentry *rt)
+ const struct sockaddr *dst, const struct rtentry *rt)
{
m_freem(m);
return (0);
Index: src/sys/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.11 src/sys/dist/pf/net/if_pfsync.c:1.12
--- src/sys/dist/pf/net/if_pfsync.c:1.11 Thu Aug 20 14:40:18 2015
+++ src/sys/dist/pf/net/if_pfsync.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pfsync.c,v 1.11 2015/08/20 14:40:18 christos Exp $ */
+/* $NetBSD: if_pfsync.c,v 1.12 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.11 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.12 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -116,7 +116,7 @@ int pfsync_alloc_scrub_memory(struct pfs
int pfsync_insert_net_state(struct pfsync_state *, u_int8_t);
void pfsync_update_net_tdb(struct pfsync_tdb *);
int pfsyncoutput(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
int pfsyncioctl(struct ifnet *, u_long, void*);
void pfsyncstart(struct ifnet *);
@@ -856,7 +856,7 @@ done:
int
pfsyncoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
m_freem(m);
return (0);
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.330 src/sys/net/if.c:1.331
--- src/sys/net/if.c:1.330 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.330 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if.c,v 1.331 2016/04/28 00:16:56 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.330 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.331 2016/04/28 00:16:56 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -308,7 +308,7 @@ if_initname(struct ifnet *ifp, const cha
int
if_nulloutput(struct ifnet *ifp, struct mbuf *m,
- const struct sockaddr *so, struct rtentry *rt)
+ const struct sockaddr *so, const struct rtentry *rt)
{
return ENXIO;
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.201 src/sys/net/if.h:1.202
--- src/sys/net/if.h:1.201 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.201 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if.h,v 1.202 2016/04/28 00:16:56 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -267,7 +267,7 @@ typedef struct ifnet {
*/
int (*if_output) /* output routine (enqueue) */
(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
void (*_if_input) /* input routine (from h/w driver) */
(struct ifnet *, struct mbuf *);
void (*if_start) /* initiate output routine */
@@ -945,7 +945,7 @@ int ifq_enqueue2(struct ifnet *, struct
int loioctl(struct ifnet *, u_long, void *);
void loopattach(int);
int looutput(struct ifnet *,
- struct mbuf *, const struct sockaddr *, struct rtentry *);
+ struct mbuf *, const struct sockaddr *, const struct rtentry *);
void lortrequest(int, struct rtentry *, const struct rt_addrinfo *);
/*
@@ -953,7 +953,7 @@ void lortrequest(int, struct rtentry *,
* an interface is going away without having to burn a flag.
*/
int if_nulloutput(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
void if_nullinput(struct ifnet *, struct mbuf *);
void if_nullstart(struct ifnet *);
int if_nullioctl(struct ifnet *, u_long, void *);
Index: src/sys/net/if_atm.h
diff -u src/sys/net/if_atm.h:1.20 src/sys/net/if_atm.h:1.21
--- src/sys/net/if_atm.h:1.20 Sun Sep 6 06:01:01 2015
+++ src/sys/net/if_atm.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.h,v 1.20 2015/09/06 06:01:01 dholland Exp $ */
+/* $NetBSD: if_atm.h,v 1.21 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -136,7 +136,7 @@ void atm_ifattach(struct ifnet *);
void atm_input(struct ifnet *, struct atm_pseudohdr *,
struct mbuf *, void *);
int atm_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
#endif
#ifdef ATM_PVCEXT
#ifdef _KERNEL
Index: src/sys/net/if_srt.c
diff -u src/sys/net/if_srt.c:1.20 src/sys/net/if_srt.c:1.21
--- src/sys/net/if_srt.c:1.20 Mon Aug 24 22:21:26 2015
+++ src/sys/net/if_srt.c Thu Apr 28 00:16:56 2016
@@ -1,8 +1,8 @@
-/* $NetBSD: if_srt.c,v 1.20 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: if_srt.c,v 1.21 2016/04/28 00:16:56 ozaki-r Exp $ */
/* This file is in the public domain. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.20 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.21 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -181,7 +181,7 @@ srt_if_output(
struct ifnet *ifp,
struct mbuf *m,
const struct sockaddr *to,
- struct rtentry *rtp)
+ const struct rtentry *rtp)
{
struct srt_softc *sc;
struct srt_rt *r;
Index: src/sys/net/if_atmsubr.c
diff -u src/sys/net/if_atmsubr.c:1.57 src/sys/net/if_atmsubr.c:1.58
--- src/sys/net/if_atmsubr.c:1.57 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_atmsubr.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atmsubr.c,v 1.57 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_atmsubr.c,v 1.58 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.57 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.58 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c
int
atm_output(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
uint16_t etype = 0; /* if using LLC/SNAP */
int error = 0, sz;
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.119 src/sys/net/if_bridge.c:1.120
--- src/sys/net/if_bridge.c:1.119 Sun Apr 24 18:08:40 2016
+++ src/sys/net/if_bridge.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.119 2016/04/24 18:08:40 christos Exp $ */
+/* $NetBSD: if_bridge.c,v 1.120 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.119 2016/04/24 18:08:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.120 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -1415,7 +1415,7 @@ bridge_enqueue(struct bridge_softc *sc,
*/
int
bridge_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *sa,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
struct ether_header *eh;
struct ifnet *dst_if;
Index: src/sys/net/if_bridgevar.h
diff -u src/sys/net/if_bridgevar.h:1.30 src/sys/net/if_bridgevar.h:1.31
--- src/sys/net/if_bridgevar.h:1.30 Tue Apr 19 07:10:22 2016
+++ src/sys/net/if_bridgevar.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridgevar.h,v 1.30 2016/04/19 07:10:22 ozaki-r Exp $ */
+/* $NetBSD: if_bridgevar.h,v 1.31 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -334,7 +334,7 @@ extern const uint8_t bstp_etheraddr[];
void bridge_ifdetach(struct ifnet *);
int bridge_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
void bstp_initialization(struct bridge_softc *);
void bstp_stop(struct bridge_softc *);
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.221 src/sys/net/if_ethersubr.c:1.222
--- src/sys/net/if_ethersubr.c:1.221 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_ethersubr.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.221 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.222 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.221 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.222 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -178,7 +178,7 @@ const uint8_t ethermulticastaddr_slowpro
#define senderr(e) { error = (e); goto bad;}
static int ether_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
/*
* Ethernet output routine.
@@ -188,7 +188,7 @@ static int ether_output(struct ifnet *,
static int
ether_output(struct ifnet * const ifp0, struct mbuf * const m0,
const struct sockaddr * const dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
uint16_t etype = 0;
int error = 0, hdrcmplt = 0;
Index: src/sys/net/if_faith.c
diff -u src/sys/net/if_faith.c:1.51 src/sys/net/if_faith.c:1.52
--- src/sys/net/if_faith.c:1.51 Thu Aug 20 14:40:19 2015
+++ src/sys/net/if_faith.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_faith.c,v 1.51 2015/08/20 14:40:19 christos Exp $ */
+/* $NetBSD: if_faith.c,v 1.52 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $KAME: if_faith.c,v 1.21 2001/02/20 07:59:26 itojun Exp $ */
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.51 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.52 2016/04/28 00:16:56 ozaki-r Exp $");
#include "opt_inet.h"
@@ -86,7 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_faith.c,v
static int faithioctl(struct ifnet *, u_long, void *);
static int faithoutput(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
static void faithrtrequest(int, struct rtentry *,
const struct rt_addrinfo *);
@@ -143,7 +143,7 @@ faith_clone_destroy(struct ifnet *ifp)
static int
faithoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
pktqueue_t *pktq;
size_t pktlen;
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.98 src/sys/net/if_fddisubr.c:1.99
--- src/sys/net/if_fddisubr.c:1.98 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_fddisubr.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.98 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.99 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.98 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.99 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -176,7 +176,7 @@ extern u_char aarp_org_code[ 3 ];
#define CFDDIADDR(ifp) CLLADDR((ifp)->if_sadl)
static int fddi_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
static void fddi_input(struct ifnet *, struct mbuf *);
/*
@@ -186,7 +186,7 @@ static void fddi_input(struct ifnet *, s
*/
static int
fddi_output(struct ifnet *ifp0, struct mbuf *m0, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
uint16_t etype;
int error = 0, hdrcmplt = 0;
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.107 src/sys/net/if_gif.c:1.108
--- src/sys/net/if_gif.c:1.107 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_gif.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.107 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_gif.c,v 1.108 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.107 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.108 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -306,7 +306,7 @@ gif_check_nesting(struct ifnet *ifp, str
int
gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
struct gif_softc *sc = ifp->if_softc;
int error = 0;
Index: src/sys/net/if_gif.h
diff -u src/sys/net/if_gif.h:1.21 src/sys/net/if_gif.h:1.22
--- src/sys/net/if_gif.h:1.21 Mon Jan 4 07:50:08 2016
+++ src/sys/net/if_gif.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.h,v 1.21 2016/01/04 07:50:08 knakahara Exp $ */
+/* $NetBSD: if_gif.h,v 1.22 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $KAME: if_gif.h,v 1.23 2001/07/27 09:21:42 itojun Exp $ */
/*
@@ -73,7 +73,7 @@ struct gif_softc {
void gifattach0(struct gif_softc *);
void gif_input(struct mbuf *, int, struct ifnet *);
int gif_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
int gif_ioctl(struct ifnet *, u_long, void *);
int gif_set_tunnel(struct ifnet *, struct sockaddr *, struct sockaddr *);
void gif_delete_tunnel(struct ifnet *);
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.21 src/sys/net/if_mpls.c:1.22
--- src/sys/net/if_mpls.c:1.21 Tue Apr 26 09:30:01 2016
+++ src/sys/net/if_mpls.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.21 2016/04/26 09:30:01 ozaki-r Exp $ */
+/* $NetBSD: if_mpls.c,v 1.22 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.21 2016/04/26 09:30:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.22 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -89,9 +89,10 @@ static struct if_clone mpls_if_cloner =
static void mpls_input(struct ifnet *, struct mbuf *);
static int mpls_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
static int mpls_ioctl(struct ifnet *, u_long, void *);
-static int mpls_send_frame(struct mbuf *, struct ifnet *, struct rtentry *);
+static int mpls_send_frame(struct mbuf *, struct ifnet *,
+ const struct rtentry *);
static int mpls_lse(struct mbuf *);
#ifdef INET
@@ -201,7 +202,8 @@ mplsintr(void)
* prepend shim and deliver
*/
static int
-mpls_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct rtentry *rt)
+mpls_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
+ const struct rtentry *rt)
{
union mpls_shim mh, *pms;
struct rtentry *rt1;
@@ -438,6 +440,12 @@ mpls_lse(struct mbuf *m)
return ENOBUFS;
}
+ if ((rt->rt_flags & RTF_GATEWAY) == 0) {
+ error = EHOSTUNREACH;
+ goto done;
+ }
+
+ rt->rt_use++;
error = mpls_send_frame(m, rt->rt_ifp, rt);
done:
@@ -450,16 +458,11 @@ done:
}
static int
-mpls_send_frame(struct mbuf *m, struct ifnet *ifp, struct rtentry *rt)
+mpls_send_frame(struct mbuf *m, struct ifnet *ifp, const struct rtentry *rt)
{
union mpls_shim msh;
int ret;
- if ((rt->rt_flags & RTF_GATEWAY) == 0)
- return EHOSTUNREACH;
-
- rt->rt_use++;
-
msh.s_addr = MPLS_GETSADDR(rt);
if (msh.shim.label == MPLS_LABEL_IMPLNULL ||
(m->m_flags & (M_MCAST | M_BCAST))) {
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.167 src/sys/net/if_gre.c:1.168
--- src/sys/net/if_gre.c:1.167 Mon Aug 24 22:21:26 2015
+++ src/sys/net/if_gre.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.167 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: if_gre.c,v 1.168 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.167 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.168 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_atalk.h"
@@ -152,7 +152,7 @@ static int gre_input(struct gre_softc *,
const struct gre_h *);
static bool gre_is_nullconf(const struct gre_soparm *);
static int gre_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
static int gre_ioctl(struct ifnet *, u_long, void *);
static int gre_getsockname(struct socket *, struct sockaddr *);
static int gre_getpeername(struct socket *, struct sockaddr *);
@@ -878,7 +878,7 @@ gre_input(struct gre_softc *sc, struct m
*/
static int
gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
int error = 0;
struct gre_softc *sc = ifp->if_softc;
Index: src/sys/net/if_hippisubr.c
diff -u src/sys/net/if_hippisubr.c:1.46 src/sys/net/if_hippisubr.c:1.47
--- src/sys/net/if_hippisubr.c:1.46 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_hippisubr.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hippisubr.c,v 1.46 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_hippisubr.c,v 1.47 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.46 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.47 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_hippisubr
#endif
static int hippi_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
static void hippi_input(struct ifnet *, struct mbuf *);
/*
@@ -85,7 +85,7 @@ static void hippi_input(struct ifnet *,
static int
hippi_output(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
uint16_t htype;
uint32_t ifield = 0;
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.53 src/sys/net/if_ieee1394subr.c:1.54
--- src/sys/net/if_ieee1394subr.c:1.53 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_ieee1394subr.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.53 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.54 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.53 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.54 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -79,12 +79,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_ieee1394s
#define senderr(e) do { error = (e); goto bad; } while(0/*CONSTCOND*/)
static int ieee1394_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
static struct mbuf *ieee1394_reass(struct ifnet *, struct mbuf *, uint16_t);
static int
ieee1394_output(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
uint16_t etype = 0;
struct mbuf *m;
Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.84 src/sys/net/if_loop.c:1.85
--- src/sys/net/if_loop.c:1.84 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_loop.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_loop.c,v 1.84 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_loop.c,v 1.85 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.84 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.85 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -205,7 +205,7 @@ loop_clone_destroy(struct ifnet *ifp)
int
looutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
pktqueue_t *pktq = NULL;
struct ifqueue *ifq = NULL;
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.150 src/sys/net/if_ppp.c:1.151
--- src/sys/net/if_ppp.c:1.150 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_ppp.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.150 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_ppp.c,v 1.151 2016/04/28 00:16:56 ozaki-r Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.150 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.151 2016/04/28 00:16:56 ozaki-r Exp $");
#include "ppp.h"
@@ -839,7 +839,7 @@ pppsioctl(struct ifnet *ifp, u_long cmd,
*/
int
pppoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
- struct rtentry *rtp)
+ const struct rtentry *rtp)
{
struct ppp_softc *sc = ifp->if_softc;
int protocol, address, control;
Index: src/sys/net/if_pppvar.h
diff -u src/sys/net/if_pppvar.h:1.27 src/sys/net/if_pppvar.h:1.28
--- src/sys/net/if_pppvar.h:1.27 Wed Feb 20 17:05:53 2008
+++ src/sys/net/if_pppvar.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppvar.h,v 1.27 2008/02/20 17:05:53 matt Exp $ */
+/* $NetBSD: if_pppvar.h,v 1.28 2016/04/28 00:16:56 ozaki-r Exp $ */
/* Id: if_pppvar.h,v 1.3 1996/07/01 01:04:37 paulus Exp */
/*
@@ -159,7 +159,7 @@ void ppp_restart(struct ppp_softc *);
void ppppktin(struct ppp_softc *, struct mbuf *, int);
struct mbuf *ppp_dequeue(struct ppp_softc *);
int pppoutput(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
#endif /* _KERNEL */
#endif /* !_NET_IF_PPPVAR_H_ */
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.122 src/sys/net/if_sl.c:1.123
--- src/sys/net/if_sl.c:1.122 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_sl.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.122 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_sl.c,v 1.123 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.122 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.123 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -198,7 +198,7 @@ static int slinput(int, struct tty *);
static int slioctl(struct ifnet *, u_long, void *);
static int slopen(dev_t, struct tty *);
static int sloutput(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
static int slstart(struct tty *);
static int sltioctl(struct tty *, u_long, void *, int, struct lwp *);
@@ -433,7 +433,7 @@ sltioctl(struct tty *tp, u_long cmd, voi
*/
static int
sloutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rtp)
+ const struct rtentry *rtp)
{
struct sl_softc *sc = ifp->if_softc;
struct ip *ip;
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.140 src/sys/net/if_spppsubr.c:1.141
--- src/sys/net/if_spppsubr.c:1.140 Sun Apr 24 17:56:31 2016
+++ src/sys/net/if_spppsubr.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.140 2016/04/24 17:56:31 christos Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.141 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.140 2016/04/24 17:56:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.141 2016/04/28 00:16:56 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -258,7 +258,7 @@ static u_short interactive_ports[8] = {
int debug = ifp->if_flags & IFF_DEBUG
static int sppp_output(struct ifnet *ifp, struct mbuf *m,
- const struct sockaddr *dst, struct rtentry *rt);
+ const struct sockaddr *dst, const struct rtentry *rt);
static void sppp_cisco_send(struct sppp *sp, int type, int32_t par1, int32_t par2);
static void sppp_cisco_input(struct sppp *sp, struct mbuf *m);
@@ -640,7 +640,7 @@ queue_pkt:
*/
static int
sppp_output(struct ifnet *ifp, struct mbuf *m,
- const struct sockaddr *dst, struct rtentry *rt)
+ const struct sockaddr *dst, const struct rtentry *rt)
{
struct sppp *sp = (struct sppp *) ifp;
struct ppp_header *h = NULL;
Index: src/sys/net/if_stf.c
diff -u src/sys/net/if_stf.c:1.87 src/sys/net/if_stf.c:1.88
--- src/sys/net/if_stf.c:1.87 Thu Jan 28 00:28:11 2016
+++ src/sys/net/if_stf.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stf.c,v 1.87 2016/01/28 00:28:11 knakahara Exp $ */
+/* $NetBSD: if_stf.c,v 1.88 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
/*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.87 2016/01/28 00:28:11 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.88 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -168,7 +168,7 @@ static const struct encapsw in_stf_encap
static int stf_encapcheck(struct mbuf *, int, int, void *);
static struct in6_ifaddr *stf_getsrcifa6(struct ifnet *);
static int stf_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
- struct rtentry *);
+ const struct rtentry *);
static int isrfc1918addr(const struct in_addr *);
static int stf_checkaddr4(struct stf_softc *, const struct in_addr *,
struct ifnet *);
@@ -325,7 +325,7 @@ stf_getsrcifa6(struct ifnet *ifp)
static int
stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt0)
+ const struct rtentry *rt0)
{
struct rtentry *rt;
struct stf_softc *sc;
Index: src/sys/net/if_strip.c
diff -u src/sys/net/if_strip.c:1.102 src/sys/net/if_strip.c:1.103
--- src/sys/net/if_strip.c:1.102 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_strip.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_strip.c,v 1.102 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_strip.c,v 1.103 2016/04/28 00:16:56 ozaki-r Exp $ */
/* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.102 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.103 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -332,7 +332,8 @@ static int stripinput(int, struct tty *)
static int stripioctl(struct ifnet *, u_long, void *);
static int stripopen(dev_t, struct tty *);
static int stripoutput(struct ifnet *,
- struct mbuf *, const struct sockaddr *, struct rtentry *);
+ struct mbuf *, const struct sockaddr *,
+ const struct rtentry *);
static int stripstart(struct tty *);
static int striptioctl(struct tty *, u_long, void *, int, struct lwp *);
@@ -721,7 +722,7 @@ strip_send(struct strip_softc *sc, struc
*/
int
stripoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
struct strip_softc *sc = ifp->if_softc;
struct ip *ip;
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.75 src/sys/net/if_tokensubr.c:1.76
--- src/sys/net/if_tokensubr.c:1.75 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_tokensubr.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.75 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.76 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.75 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.76 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -143,7 +143,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tokensubr
#define RCF_SINGLEROUTE (2 << 8) | TOKEN_RCF_FRAME2 | TOKEN_RCF_BROADCAST_SINGLE
static int token_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
static void token_input(struct ifnet *, struct mbuf *);
/*
@@ -154,7 +154,7 @@ static void token_input(struct ifnet *,
*/
static int
token_output(struct ifnet *ifp0, struct mbuf *m0, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
uint16_t etype;
int error = 0;
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.124 src/sys/net/if_tun.c:1.125
--- src/sys/net/if_tun.c:1.124 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_tun.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.124 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_tun.c,v 1.125 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1988, Julian Onions <[email protected]>
@@ -15,7 +15,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.124 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.125 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -73,7 +73,7 @@ static kmutex_t tun_softc_lock;
static int tun_ioctl(struct ifnet *, u_long, void *);
static int tun_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *rt);
+ const struct sockaddr *, const struct rtentry *rt);
static int tun_clone_create(struct if_clone *, int);
static int tun_clone_destroy(struct ifnet *);
@@ -494,7 +494,7 @@ tun_ioctl(struct ifnet *ifp, u_long cmd,
*/
static int
tun_output(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
struct tun_softc *tp = ifp->if_softc;
int s;
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.166 src/sys/net/route.c:1.167
--- src/sys/net/route.c:1.166 Tue Apr 26 09:31:18 2016
+++ src/sys/net/route.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.166 2016/04/26 09:31:18 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.167 2016/04/28 00:16:56 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.166 2016/04/26 09:31:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.167 2016/04/28 00:16:56 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -1488,13 +1488,13 @@ rt_settag(struct rtentry *rt, const stru
}
struct sockaddr *
-rt_gettag(struct rtentry *rt)
+rt_gettag(const struct rtentry *rt)
{
return rt->rt_tag;
}
int
-rt_check_reject_route(struct rtentry *rt, struct ifnet *ifp)
+rt_check_reject_route(const struct rtentry *rt, const struct ifnet *ifp)
{
if ((rt->rt_flags & RTF_REJECT) != 0) {
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.100 src/sys/net/route.h:1.101
--- src/sys/net/route.h:1.100 Tue Apr 26 09:30:01 2016
+++ src/sys/net/route.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.100 2016/04/26 09:30:01 ozaki-r Exp $ */
+/* $NetBSD: route.h,v 1.101 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -403,9 +403,9 @@ int rt_setgate(struct rtentry *, const s
const struct sockaddr *
rt_settag(struct rtentry *, const struct sockaddr *);
struct sockaddr *
- rt_gettag(struct rtentry *);
+ rt_gettag(const struct rtentry *);
-int rt_check_reject_route(struct rtentry *, struct ifnet *);
+int rt_check_reject_route(const struct rtentry *, const struct ifnet *);
static inline void
rt_assert_referenced(const struct rtentry *rt)
Index: src/sys/netinet/if_atm.c
diff -u src/sys/netinet/if_atm.c:1.37 src/sys/netinet/if_atm.c:1.38
--- src/sys/netinet/if_atm.c:1.37 Mon Apr 4 07:37:07 2016
+++ src/sys/netinet/if_atm.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.c,v 1.37 2016/04/04 07:37:07 ozaki-r Exp $ */
+/* $NetBSD: if_atm.c,v 1.38 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.37 2016/04/04 07:37:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.38 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -201,18 +201,18 @@ failed:
*/
int
-atmresolve(struct rtentry *rt0, struct mbuf *m, const struct sockaddr *dst,
+atmresolve(const struct rtentry *rt0, struct mbuf *m, const struct sockaddr *dst,
struct atm_pseudohdr *desten /* OUT */)
{
const struct sockaddr_dl *sdl;
- struct rtentry *rt = rt0;
+ struct rtentry *rt = NULL;
if (m->m_flags & (M_BCAST|M_MCAST)) {
log(LOG_INFO, "atmresolve: BCAST/MCAST packet detected/dumped\n");
goto bad;
}
- if (rt == NULL) {
+ if (rt0 == NULL) {
rt = RTALLOC1(dst, 0);
if (rt == NULL)
goto bad; /* failed */
@@ -231,7 +231,7 @@ atmresolve(struct rtentry *rt0, struct m
* ATM ARP [c.f. if_ether.c]).
*/
- sdl = satocsdl(rt->rt_gateway);
+ sdl = satocsdl((rt ? rt : rt0)->rt_gateway);
/*
* Check the address family and length is valid, the address
@@ -240,12 +240,12 @@ atmresolve(struct rtentry *rt0, struct m
if (sdl->sdl_family == AF_LINK && sdl->sdl_alen == sizeof(*desten)) {
memcpy(desten, CLLADDR(sdl), sdl->sdl_alen);
- if (rt != rt0)
+ if (rt != NULL)
rtfree(rt);
return (1); /* ok, go for it! */
}
- if (rt != rt0)
+ if (rt != NULL)
rtfree(rt);
/*
Index: src/sys/netinet/if_atm.h
diff -u src/sys/netinet/if_atm.h:1.12 src/sys/netinet/if_atm.h:1.13
--- src/sys/netinet/if_atm.h:1.12 Tue Feb 1 19:43:12 2011
+++ src/sys/netinet/if_atm.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.h,v 1.12 2011/02/01 19:43:12 chuck Exp $ */
+/* $NetBSD: if_atm.h,v 1.13 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -33,7 +33,7 @@
*/
void atm_rtrequest(int, struct rtentry *, const struct rt_addrinfo *);
-int atmresolve(struct rtentry *, struct mbuf *, const struct sockaddr *,
+int atmresolve(const struct rtentry *, struct mbuf *, const struct sockaddr *,
struct atm_pseudohdr *);
#endif /* !_NETINET_IF_ATM_H_ */
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.63 src/sys/netinet/ip_carp.c:1.64
--- src/sys/netinet/ip_carp.c:1.63 Mon Apr 4 07:37:07 2016
+++ src/sys/netinet/ip_carp.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.63 2016/04/04 07:37:07 ozaki-r Exp $ */
+/* $NetBSD: ip_carp.c,v 1.64 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.63 2016/04/04 07:37:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.64 2016/04/28 00:16:56 ozaki-r Exp $");
/*
* TODO:
@@ -2090,7 +2090,7 @@ carp_start(struct ifnet *ifp)
int
carp_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *sa,
- struct rtentry *rt)
+ const struct rtentry *rt)
{
struct carp_softc *sc = ((struct carp_softc *)ifp->if_softc);
KASSERT(KERNEL_LOCKED_P());
Index: src/sys/netinet/ip_carp.h
diff -u src/sys/netinet/ip_carp.h:1.7 src/sys/netinet/ip_carp.h:1.8
--- src/sys/netinet/ip_carp.h:1.7 Thu Jul 31 00:58:02 2014
+++ src/sys/netinet/ip_carp.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.h,v 1.7 2014/07/31 00:58:02 ozaki-r Exp $ */
+/* $NetBSD: ip_carp.h,v 1.8 2016/04/28 00:16:56 ozaki-r Exp $ */
/* $OpenBSD: ip_carp.h,v 1.18 2005/04/20 23:00:41 mpf Exp $ */
/*
@@ -163,6 +163,6 @@ struct ifaddr *carp_iamatch6(void *, str
struct ifnet *carp_ourether(void *, struct ether_header *, u_char, int);
int carp_input(struct mbuf *, u_int8_t *, u_int8_t *, u_int16_t);
int carp_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *);
+ const struct sockaddr *, const struct rtentry *);
#endif /* _KERNEL */
#endif /* _NETINET_IP_CARP_H_ */
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.252 src/sys/netinet/ip_output.c:1.253
--- src/sys/netinet/ip_output.c:1.252 Tue Apr 26 09:30:01 2016
+++ src/sys/netinet/ip_output.c Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.252 2016/04/26 09:30:01 ozaki-r Exp $ */
+/* $NetBSD: ip_output.c,v 1.253 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.252 2016/04/26 09:30:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.253 2016/04/28 00:16:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -158,7 +158,8 @@ extern pfil_head_t *inet_pfil_hook; /*
int ip_do_loopback_cksum = 0;
static int
-ip_mark_mpls(struct ifnet * const ifp, struct mbuf * const m, struct rtentry *rt)
+ip_mark_mpls(struct ifnet * const ifp, struct mbuf * const m,
+ const struct rtentry *rt)
{
int error = 0;
#ifdef MPLS
@@ -193,7 +194,7 @@ ip_mark_mpls(struct ifnet * const ifp, s
*/
int
ip_if_output(struct ifnet * const ifp, struct mbuf * const m,
- const struct sockaddr * const dst, struct rtentry *rt)
+ const struct sockaddr * const dst, const struct rtentry *rt)
{
int error = 0;
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.111 src/sys/netinet/ip_var.h:1.112
--- src/sys/netinet/ip_var.h:1.111 Tue Apr 26 09:30:01 2016
+++ src/sys/netinet/ip_var.h Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.111 2016/04/26 09:30:01 ozaki-r Exp $ */
+/* $NetBSD: ip_var.h,v 1.112 2016/04/28 00:16:56 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -239,7 +239,7 @@ int ip_setmoptions(struct ip_moptions **
int ip_getmoptions(struct ip_moptions *, struct sockopt *sopt);
int ip_if_output(struct ifnet * const, struct mbuf * const,
- const struct sockaddr * const, struct rtentry *);
+ const struct sockaddr * const, const struct rtentry *);
/* IP Flow interface. */
void ipflow_init(void);
Index: src/sys/netisdn/i4b_ipr.c
diff -u src/sys/netisdn/i4b_ipr.c:1.37 src/sys/netisdn/i4b_ipr.c:1.38
--- src/sys/netisdn/i4b_ipr.c:1.37 Wed Apr 20 09:01:04 2016
+++ src/sys/netisdn/i4b_ipr.c Thu Apr 28 00:16:56 2016
@@ -27,7 +27,7 @@
* i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
* ---------------------------------------------------------
*
- * $Id: i4b_ipr.c,v 1.37 2016/04/20 09:01:04 knakahara Exp $
+ * $Id: i4b_ipr.c,v 1.38 2016/04/28 00:16:56 ozaki-r Exp $
*
* $FreeBSD$
*
@@ -59,7 +59,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.37 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.38 2016/04/28 00:16:56 ozaki-r Exp $");
#include "irip.h"
#include "opt_irip.h"
@@ -257,7 +257,8 @@ static int iprwatchdog(int unit);
static void iprwatchdog(struct ifnet *ifp);
#endif
static void ipr_tx_queue_empty(void *);
-static int iripoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct rtentry *rtp);
+static int iripoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
+ const struct rtentry *rtp);
static void iripclearqueues(struct ipr_softc *sc);
static void ipr_set_linktab(void *softc, isdn_link_t *ilt);
static void ipr_activity(void *softc, int rxtx);
@@ -415,7 +416,7 @@ iripattach(void)
*---------------------------------------------------------------------------*/
static int
iripoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
- struct rtentry *rtp)
+ const struct rtentry *rtp)
{
struct ipr_softc *sc;
int s, rv;
