Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by ozaki...



details:   https://anonhg.NetBSD.org/src/rev/ff6a14398ef1
branches:  netbsd-8
changeset: 851118:ff6a14398ef1
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Nov 08 22:20:59 2017 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #349):
        sys/net/if_l2tp.c: revision 1.14
        sys/net/if_tap.c: revision 1.101
        sys/net/if_tun.c: revision 1.141
        sys/net/if_vlan.c: revision 1.106
Set IFEF_NO_LINK_STATE_CHANGE flag to pseudo devices that don't use
if_link_state_change

diffstat:

 sys/net/if_l2tp.c |  7 ++++---
 sys/net/if_tap.c  |  5 +++--
 sys/net/if_tun.c  |  5 +++--
 sys/net/if_vlan.c |  6 +++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diffs (107 lines):

diff -r 3d2d272bb001 -r ff6a14398ef1 sys/net/if_l2tp.c
--- a/sys/net/if_l2tp.c Mon Nov 06 10:40:42 2017 +0000
+++ b/sys/net/if_l2tp.c Wed Nov 08 22:20:59 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_l2tp.c,v 1.11.2.1 2017/11/06 09:59:01 snj Exp $     */
+/*     $NetBSD: if_l2tp.c,v 1.11.2.2 2017/11/08 22:20:59 snj Exp $     */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.1 2017/11/06 09:59:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.2 2017/11/08 22:20:59 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -261,7 +261,8 @@
        sc->l2tp_ec.ec_if.if_addrlen = 0;
        sc->l2tp_ec.ec_if.if_mtu    = L2TP_MTU;
        sc->l2tp_ec.ec_if.if_flags  = IFF_POINTOPOINT|IFF_MULTICAST|IFF_SIMPLEX;
-       sc->l2tp_ec.ec_if.if_extflags  = IFEF_OUTPUT_MPSAFE|IFEF_START_MPSAFE;
+       sc->l2tp_ec.ec_if.if_extflags  = IFEF_OUTPUT_MPSAFE |
+           IFEF_START_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
        sc->l2tp_ec.ec_if.if_ioctl  = l2tp_ioctl;
        sc->l2tp_ec.ec_if.if_output = l2tp_output;
        sc->l2tp_ec.ec_if.if_type   = IFT_L2TP;
diff -r 3d2d272bb001 -r ff6a14398ef1 sys/net/if_tap.c
--- a/sys/net/if_tap.c  Mon Nov 06 10:40:42 2017 +0000
+++ b/sys/net/if_tap.c  Wed Nov 08 22:20:59 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tap.c,v 1.99 2017/02/12 09:47:31 skrll Exp $        */
+/*     $NetBSD: if_tap.c,v 1.99.6.1 2017/11/08 22:20:59 snj Exp $      */
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.99 2017/02/12 09:47:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.99.6.1 2017/11/08 22:20:59 snj Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -370,6 +370,7 @@
        strcpy(ifp->if_xname, device_xname(self));
        ifp->if_softc   = sc;
        ifp->if_flags   = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+       ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE;
        ifp->if_ioctl   = tap_ioctl;
        ifp->if_start   = tap_start;
        ifp->if_stop    = tap_stop;
diff -r 3d2d272bb001 -r ff6a14398ef1 sys/net/if_tun.c
--- a/sys/net/if_tun.c  Mon Nov 06 10:40:42 2017 +0000
+++ b/sys/net/if_tun.c  Wed Nov 08 22:20:59 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tun.c,v 1.139 2017/05/24 06:52:14 pgoyette Exp $    */
+/*     $NetBSD: if_tun.c,v 1.139.2.1 2017/11/08 22:20:59 snj Exp $     */
 
 /*
  * Copyright (c) 1988, Julian Onions <jpo%cs.nott.ac.uk@localhost>
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.139 2017/05/24 06:52:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.139.2.1 2017/11/08 22:20:59 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -247,6 +247,7 @@
        ifp->if_start = tunstart;
 #endif
        ifp->if_flags = IFF_POINTOPOINT;
+       ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE;
        ifp->if_type = IFT_TUNNEL;
        ifp->if_snd.ifq_maxlen = ifqmaxlen;
        ifp->if_collisions = 0;
diff -r 3d2d272bb001 -r ff6a14398ef1 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Mon Nov 06 10:40:42 2017 +0000
+++ b/sys/net/if_vlan.c Wed Nov 08 22:20:59 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.97.2.5 2017/11/06 09:57:39 snj Exp $     */
+/*     $NetBSD: if_vlan.c,v 1.97.2.6 2017/11/08 22:20:59 snj Exp $     */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.5 2017/11/06 09:57:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.6 2017/11/08 22:20:59 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -337,7 +337,7 @@
        if_initname(ifp, ifc->ifc_name, unit);
        ifp->if_softc = ifv;
        ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-       ifp->if_extflags = IFEF_START_MPSAFE;
+       ifp->if_extflags = IFEF_START_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
        ifp->if_start = vlan_start;
        ifp->if_transmit = vlan_transmit;
        ifp->if_ioctl = vlan_ioctl;



Home | Main Index | Thread Index | Old Index