Author: tuexen
Date: Tue May 3 20:34:02 2011
New Revision: 221411
URL: http://svn.freebsd.org/changeset/base/221411
Log:
Remove code with any effect.
Modified:
head/sys/netinet/sctp_asconf.c
head/sys/netinet/sctp_auth.c
head/sys/netinet/sctputil.c
head/sys/netinet6/sctp6_usrreq.c
Modified: head/sys/netinet/sctp_asconf.c
==============================================================================
--- head/sys/netinet/sctp_asconf.c Tue May 3 20:32:21 2011
(r221410)
+++ head/sys/netinet/sctp_asconf.c Tue May 3 20:34:02 2011
(r221411)
@@ -2813,7 +2813,6 @@ sctp_compose_asconf(struct sctp_tcb *stc
lookup->ph.param_length = htons(SCTP_SIZE32(p_size));
memcpy(lookup->addr, addr_ptr, addr_size);
SCTP_BUF_LEN(m_asconf_chk) += SCTP_SIZE32(p_size);
- lookup_used = 1;
} else {
/* uh oh... don't have any address?? */
SCTPDBG(SCTP_DEBUG_ASCONF1,
@@ -2823,7 +2822,6 @@ sctp_compose_asconf(struct sctp_tcb *stc
lookup->ph.param_length =
htons(SCTP_SIZE32(sizeof(struct sctp_ipv4addr_param)));
bzero(lookup->addr, sizeof(struct in_addr));
SCTP_BUF_LEN(m_asconf_chk) += SCTP_SIZE32(sizeof(struct
sctp_ipv4addr_param));
- lookup_used = 1;
}
}
/* chain it all together */
Modified: head/sys/netinet/sctp_auth.c
==============================================================================
--- head/sys/netinet/sctp_auth.c Tue May 3 20:32:21 2011
(r221410)
+++ head/sys/netinet/sctp_auth.c Tue May 3 20:34:02 2011
(r221411)
@@ -1949,9 +1949,6 @@ sctp_validate_init_auth_params(struct mb
case SCTP_ASCONF_ACK:
peer_supports_asconf = 1;
break;
- case SCTP_AUTHENTICATION:
- peer_supports_auth = 1;
- break;
default:
/* one we don't care about */
break;
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Tue May 3 20:32:21 2011 (r221410)
+++ head/sys/netinet/sctputil.c Tue May 3 20:34:02 2011 (r221411)
@@ -3850,8 +3850,6 @@ sctp_abort_an_association(struct sctp_in
#endif
)
{
- uint32_t vtag;
-
#if defined (__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
struct socket *so;
@@ -3872,7 +3870,6 @@ sctp_abort_an_association(struct sctp_in
} else {
stcb->asoc.state |= SCTP_STATE_WAS_ABORTED;
}
- vtag = stcb->asoc.peer_vtag;
/* notify the ulp */
if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0)
sctp_abort_notification(stcb, error, so_locked);
Modified: head/sys/netinet6/sctp6_usrreq.c
==============================================================================
--- head/sys/netinet6/sctp6_usrreq.c Tue May 3 20:32:21 2011
(r221410)
+++ head/sys/netinet6/sctp6_usrreq.c Tue May 3 20:34:02 2011
(r221411)
@@ -1066,10 +1066,8 @@ sctp6_connect(struct socket *so, struct
SCTP_LTRACE_ERR_RET(inp, NULL, NULL,
SCTP_FROM_SCTP6_USRREQ, EINVAL);
return EINVAL;
}
- } else
+ }
#endif /* INET */
- addr = addr; /* for true v6 address case */
-
/* Now do we connect? */
if (inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED) {
stcb = LIST_FIRST(&inp->sctp_asoc_list);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
