Source-Changes-HG archive

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

[src/trunk]: src/sys Move rt_gwroute operation out of stripoutput



details:   https://anonhg.NetBSD.org/src/rev/4beefc78eb90
branches:  trunk
changeset: 339332:4beefc78eb90
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue Jul 14 08:44:59 2015 +0000

description:
Move rt_gwroute operation out of stripoutput

We should do it in ip_hresolv_needed.

diffstat:

 sys/net/if_strip.c      |  7 ++-----
 sys/netinet/ip_output.c |  5 +++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r edb4dbda9e54 -r 4beefc78eb90 sys/net/if_strip.c
--- a/sys/net/if_strip.c        Tue Jul 14 08:15:41 2015 +0000
+++ b/sys/net/if_strip.c        Tue Jul 14 08:44:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_strip.c,v 1.99 2015/07/14 08:15:41 ozaki-r Exp $    */
+/*     $NetBSD: if_strip.c,v 1.100 2015/07/14 08:44:59 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.99 2015/07/14 08:15:41 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.100 2015/07/14 08:44:59 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -755,9 +755,6 @@
 #endif
        switch (dst->sa_family) {
        case AF_INET:
-               if (rt != NULL && rt->rt_gwroute != NULL)
-                       rt = rt->rt_gwroute;
-
                /* assume rt is never NULL */
                if (rt == NULL || rt->rt_gateway->sa_family != AF_LINK ||
                    satocsdl(rt->rt_gateway)->sdl_alen != ifp->if_addrlen) {
diff -r edb4dbda9e54 -r 4beefc78eb90 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Tue Jul 14 08:15:41 2015 +0000
+++ b/sys/netinet/ip_output.c   Tue Jul 14 08:44:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.242 2015/07/01 03:39:36 ozaki-r Exp $  */
+/*     $NetBSD: ip_output.c,v 1.243 2015/07/14 08:44:59 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.242 2015/07/01 03:39:36 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.243 2015/07/14 08:44:59 ozaki-r Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -167,6 +167,7 @@
        case IFT_HIPPI:
        case IFT_IEEE1394:
        case IFT_ISO88025:
+       case IFT_SLIP:
                return true;
        default:
                return false;



Home | Main Index | Thread Index | Old Index