- Take out the broken table-id concept. Panda Routers have a M-VRF

  concept that is NOT well thought out for a multi-homed transport
  protocol. So the useless table-id entries passed around need to
  be removed.
- Add a event timer for the zero copy api.
- Fix a bug in sctp_timer.c when searching for an alternate
  with the largest ssthresh (the compare was wrong).

1 files changed, 4 insertions, 10 deletions

diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index 427b69b9364b..cf8df3a07088 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -71,7 +71,7 @@ sctp6_input(i_pak, offp, proto)
 	struct sctp_nets *net;
 	int refcount_up = 0;
 	uint32_t check, calc_check;
-	uint32_t vrf_id = 0, table_id = 0;
+	uint32_t vrf_id = 0;
 	struct inpcb *in6p_ip;
 	struct sctp_chunkhdr *ch;
 	int length, mlen, offset, iphlen;
@@ -85,10 +85,6 @@ sctp6_input(i_pak, offp, proto)
 		SCTP_RELEASE_PKT(*i_pak);
 		return (-1);
 	}
-	if (SCTP_GET_PKT_TABLEID(*i_pak, table_id)) {
-		SCTP_RELEASE_PKT(*i_pak);
-		return (-1);
-	}
 	m = SCTP_HEADER_TO_CHAIN(*i_pak);
 	pkt_len = SCTP_HEADER_LEN((*i_pak));
 
@@ -189,16 +185,14 @@ sctp_skip_csum:
 				sh->v_tag = 0;
 		}
 		if (ch->chunk_type == SCTP_SHUTDOWN_ACK) {
-			sctp_send_shutdown_complete2(m, iphlen, sh, vrf_id,
-			    table_id);
+			sctp_send_shutdown_complete2(m, iphlen, sh, vrf_id);
 			goto bad;
 		}
 		if (ch->chunk_type == SCTP_SHUTDOWN_COMPLETE) {
 			goto bad;
 		}
 		if (ch->chunk_type != SCTP_ABORT_ASSOCIATION)
-			sctp_send_abort(m, iphlen, sh, 0, NULL, vrf_id,
-			    table_id);
+			sctp_send_abort(m, iphlen, sh, 0, NULL, vrf_id);
 		goto bad;
 	} else if (stcb == NULL) {
 		refcount_up = 1;
@@ -226,7 +220,7 @@ sctp_skip_csum:
 
 	/* sa_ignore NO_NULL_CHK */
 	sctp_common_input_processing(&m, iphlen, offset, length, sh, ch,
-	    in6p, stcb, net, ecn_bits, vrf_id, table_id);
+	    in6p, stcb, net, ecn_bits, vrf_id);
 	/* inp's ref-count reduced && stcb unlocked */
 	/* XXX this stuff below gets moved to appropriate parts later... */
 	if (m)