Author: tuexen
Date: Sun Jul 1 08:11:15 2012
New Revision: 237902
URL: http://svn.freebsd.org/changeset/base/237902
Log:
MFC r236492:
Don't request data from the IPv6 layer, which is not used.
Modified:
stable/9/sys/netinet/sctp_output.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_output.c
==============================================================================
--- stable/9/sys/netinet/sctp_output.c Sun Jul 1 08:10:49 2012
(r237901)
+++ stable/9/sys/netinet/sctp_output.c Sun Jul 1 08:11:15 2012
(r237902)
@@ -11059,11 +11059,8 @@ sctp_send_shutdown_complete2(struct mbuf
#endif
#ifdef INET6
if (ip6_out != NULL) {
- struct route_in6 ro;
int ret;
- struct ifnet *ifp = NULL;
- bzero(&ro, sizeof(ro));
mlen = SCTP_BUF_LEN(mout);
#ifdef SCTP_PACKET_LOGGING
if (SCTP_BASE_SYSCTL(sctp_logging_level) &
SCTP_LAST_PACKET_TRACING)
@@ -11089,11 +11086,7 @@ sctp_send_shutdown_complete2(struct mbuf
SCTP_STAT_INCR(sctps_sendhwcrc);
#endif
}
- SCTP_IP6_OUTPUT(ret, o_pak, &ro, &ifp, NULL, vrf_id);
-
- /* Free the route if we got one back */
- if (ro.ro_rt)
- RTFREE(ro.ro_rt);
+ SCTP_IP6_OUTPUT(ret, o_pak, NULL, NULL, NULL, vrf_id);
}
#endif
SCTP_STAT_INCR(sctps_sendpackets);
@@ -12160,12 +12153,8 @@ sctp_send_abort(struct mbuf *m, int iphl
#endif
#ifdef INET6
if (ip6_out != NULL) {
- struct route_in6 ro;
int ret;
- struct ifnet *ifp = NULL;
- /* zap the stack pointer to the route */
- bzero(&ro, sizeof(ro));
if (port) {
udp->uh_ulen = htons(len - sizeof(struct ip6_hdr));
}
@@ -12196,11 +12185,7 @@ sctp_send_abort(struct mbuf *m, int iphl
SCTP_STAT_INCR(sctps_sendhwcrc);
#endif
}
- SCTP_IP6_OUTPUT(ret, o_pak, &ro, &ifp, NULL, vrf_id);
-
- /* Free the route if we got one back */
- if (ro.ro_rt)
- RTFREE(ro.ro_rt);
+ SCTP_IP6_OUTPUT(ret, o_pak, NULL, NULL, NULL, vrf_id);
}
#endif
SCTP_STAT_INCR(sctps_sendpackets);
@@ -12426,12 +12411,8 @@ sctp_send_operr_to(struct mbuf *m, int i
#endif
#ifdef INET6
if (ip6_out != NULL) {
- struct route_in6 ro;
int ret;
- struct ifnet *ifp = NULL;
- /* zap the stack pointer to the route */
- bzero(&ro, sizeof(ro));
if (port) {
udp->uh_ulen = htons(len - sizeof(struct ip6_hdr));
}
@@ -12460,11 +12441,7 @@ sctp_send_operr_to(struct mbuf *m, int i
SCTP_STAT_INCR(sctps_sendhwcrc);
#endif
}
- SCTP_IP6_OUTPUT(ret, o_pak, &ro, &ifp, NULL, vrf_id);
-
- /* Free the route if we got one back */
- if (ro.ro_rt)
- RTFREE(ro.ro_rt);
+ SCTP_IP6_OUTPUT(ret, o_pak, NULL, NULL, NULL, vrf_id);
}
#endif
SCTP_STAT_INCR(sctps_sendpackets);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
