- 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, 5 insertions, 2 deletions

diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h
index 7f336e707be6..af69bbe67224 100644
--- a/sys/netinet/sctp_pcb.h
+++ b/sys/netinet/sctp_pcb.h
@@ -79,6 +79,9 @@ struct sctp_ifn {
 	uint32_t refcount;	/* number of reference held should be >=
 				 * ifa_count */
 	uint32_t ifa_count;	/* IFA's we hold (in our list - ifalist) */
+	uint32_t num_v6;	/* number of v6 addresses */
+	uint32_t num_v4;	/* number of v4 addresses */
+	uint32_t registered_af;	/* registered address family for i/f events */
 	char ifn_name[SCTP_IFNAMSIZ];
 };
 
@@ -109,7 +112,6 @@ struct sctp_ifa {
 	uint8_t src_is_priv;
 	uint8_t src_is_glob;
 	uint8_t resv;
-
 };
 
 struct sctp_laddr {
@@ -281,6 +283,8 @@ struct sctp_pcb {
 
 	/* Zero copy full buffer timer */
 	struct sctp_timer zero_copy_timer;
+	/* Zero copy app to transport (sendq) read repulse timer */
+	struct sctp_timer zero_copy_sendq_timer;
 	int def_cookie_life;
 	/* defaults to 0 */
 	int auto_close_time;
@@ -364,7 +368,6 @@ struct sctp_inpcb {
 	struct mtx inp_rdata_mtx;
 	int32_t refcount;
 	uint32_t def_vrf_id;
-	uint32_t def_table_id;
 	uint32_t total_sends;
 	uint32_t total_recvs;
 	uint32_t last_abort_code;