svn commit: r256621 - user/ae/inet6/sys/netinet6
Andrey V. Elsukov
ae at FreeBSD.org
Wed Oct 16 11:53:03 UTC 2013
Author: ae
Date: Wed Oct 16 11:53:03 2013
New Revision: 256621
URL: http://svnweb.freebsd.org/changeset/base/256621
Log:
Don't pass rtentry to nd6_output.
Modified:
user/ae/inet6/sys/netinet6/ip6_forward.c
user/ae/inet6/sys/netinet6/ip6_output.c
Modified: user/ae/inet6/sys/netinet6/ip6_forward.c
==============================================================================
--- user/ae/inet6/sys/netinet6/ip6_forward.c Wed Oct 16 11:51:08 2013 (r256620)
+++ user/ae/inet6/sys/netinet6/ip6_forward.c Wed Oct 16 11:53:03 2013 (r256621)
@@ -620,7 +620,7 @@ skip_routing:
}
pass:
- error = nd6_output(rt->rt_ifp, origifp, m, dst, rt);
+ error = nd6_output(rt->rt_ifp, origifp, m, dst, NULL);
if (error) {
in6_ifstat_inc(rt->rt_ifp, ifs6_out_discard);
IP6STAT_INC(ip6s_cantforward);
Modified: user/ae/inet6/sys/netinet6/ip6_output.c
==============================================================================
--- user/ae/inet6/sys/netinet6/ip6_output.c Wed Oct 16 11:51:08 2013 (r256620)
+++ user/ae/inet6/sys/netinet6/ip6_output.c Wed Oct 16 11:53:03 2013 (r256621)
@@ -1066,7 +1066,7 @@ passout:
ia6->ia_ifa.if_obytes += m->m_pkthdr.len;
ifa_free(&ia6->ia_ifa);
}
- error = nd6_output(ifp, origifp, m, dst, ro->ro_rt);
+ error = nd6_output(ifp, origifp, m, dst, NULL);
goto done;
}
@@ -1221,7 +1221,7 @@ sendorfree:
ia->ia_ifa.if_opackets++;
ia->ia_ifa.if_obytes += m->m_pkthdr.len;
}
- error = nd6_output(ifp, origifp, m, dst, ro->ro_rt);
+ error = nd6_output(ifp, origifp, m, dst, NULL);
} else
m_freem(m);
}
More information about the svn-src-user
mailing list