Module Name: src
Committed By: ozaki-r
Date: Tue Jul 14 08:44:59 UTC 2015
Modified Files:
src/sys/net: if_strip.c
src/sys/netinet: ip_output.c
Log Message:
Move rt_gwroute operation out of stripoutput
We should do it in ip_hresolv_needed.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/net/if_strip.c
cvs rdiff -u -r1.242 -r1.243 src/sys/netinet/ip_output.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/net/if_strip.c
diff -u src/sys/net/if_strip.c:1.99 src/sys/net/if_strip.c:1.100
--- src/sys/net/if_strip.c:1.99 Tue Jul 14 08:15:41 2015
+++ src/sys/net/if_strip.c Tue Jul 14 08:44:59 2015
@@ -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 @@ stripoutput(struct ifnet *ifp, struct mb
#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) {
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.242 src/sys/netinet/ip_output.c:1.243
--- src/sys/netinet/ip_output.c:1.242 Wed Jul 1 03:39:36 2015
+++ src/sys/netinet/ip_output.c Tue Jul 14 08:44:59 2015
@@ -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 @@ ip_hresolv_needed(const struct ifnet * c
case IFT_HIPPI:
case IFT_IEEE1394:
case IFT_ISO88025:
+ case IFT_SLIP:
return true;
default:
return false;
