svn commit: r231430 - in stable/8/sys: netinet netinet6

[Michael Tuexen]

Author: tuexen
Date: Fri Feb 10 20:36:17 2012
New Revision: 231430
URL: http://svn.freebsd.org/changeset/base/231430

Log:
  MFC r221411:
  Remove code with any effect.

Modified:
  stable/8/sys/netinet/sctp_asconf.c
  stable/8/sys/netinet/sctp_auth.c
  stable/8/sys/netinet/sctputil.c
  stable/8/sys/netinet6/sctp6_usrreq.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/8/sys/netinet/sctp_asconf.c	Fri Feb 10 20:34:20 2012	(r231429)
+++ stable/8/sys/netinet/sctp_asconf.c	Fri Feb 10 20:36:17 2012	(r231430)
@@ -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: stable/8/sys/netinet/sctp_auth.c
==============================================================================
--- stable/8/sys/netinet/sctp_auth.c	Fri Feb 10 20:34:20 2012	(r231429)
+++ stable/8/sys/netinet/sctp_auth.c	Fri Feb 10 20:36:17 2012	(r231430)
@@ -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: stable/8/sys/netinet/sctputil.c
==============================================================================
--- stable/8/sys/netinet/sctputil.c	Fri Feb 10 20:34:20 2012	(r231429)
+++ stable/8/sys/netinet/sctputil.c	Fri Feb 10 20:36:17 2012	(r231430)
@@ -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: stable/8/sys/netinet6/sctp6_usrreq.c
==============================================================================
--- stable/8/sys/netinet6/sctp6_usrreq.c	Fri Feb 10 20:34:20 2012	(r231429)
+++ stable/8/sys/netinet6/sctp6_usrreq.c	Fri Feb 10 20:36:17 2012	(r231430)
@@ -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);