Sync with main sources.

git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@7619 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7

6 files changed, 0 insertions, 10 deletions

diff --git a/netinet/sctp_indata.c b/netinet/sctp_indata.c
index abeb4eb..cece4be 100755
--- a/netinet/sctp_indata.c
+++ b/netinet/sctp_indata.c
@@ -4016,8 +4016,6 @@ sctp_express_handle_sack(struct sctp_tcb *stcb, uint32_t cumack,
 			sb_free_now = SCTP_SB_LIMIT_SND(so) - (inqueue_bytes + stcb->asoc.sb_send_resv);
 		}
 	}
-	/* update the amount free in the send socket buffer for next time */
-	inp->prev_send_sb_free = sb_free_now;
 #else
 	/* sa_ignore NO_NULL_CHK */
 	if (stcb->sctp_socket) {
@@ -4790,8 +4788,6 @@ sctp_handle_sack(struct mbuf *m, int offset_seg, int offset_dup,
 			sb_free_now = SCTP_SB_LIMIT_SND(so) - (inqueue_bytes + stcb->asoc.sb_send_resv);
 		}
 	}
-	/* update the amount free in the send socket buffer for next time */
-	inp->prev_send_sb_free = sb_free_now;
 #else
 	/* sa_ignore NO_NULL_CHK */
 	if ((wake_him) && (stcb->sctp_socket)) {
diff --git a/netinet/sctp_input.c b/netinet/sctp_input.c
index 8451aec..601f7af 100755
--- a/netinet/sctp_input.c
+++ b/netinet/sctp_input.c
@@ -2819,7 +2819,6 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset,
 			inp->recv_callback = (*inp_p)->recv_callback;
 			inp->send_callback = (*inp_p)->send_callback;
 			inp->send_sb_threshold = (*inp_p)->send_sb_threshold;
-			inp->prev_send_sb_free = (*inp_p)->prev_send_sb_free;
 #endif
 			/*
 			 * copy in the authentication parameters from the
diff --git a/netinet/sctp_pcb.c b/netinet/sctp_pcb.c
index a62c40a..b9e7328 100755
--- a/netinet/sctp_pcb.c
+++ b/netinet/sctp_pcb.c
@@ -2694,7 +2694,6 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
 	inp->recv_callback = NULL;
 	inp->send_callback = NULL;
 	inp->send_sb_threshold = 0;
-	inp->prev_send_sb_free = 0;
 #endif
 	/* init the small hash table we use to track asocid <-> tcb */
 	inp->sctp_asocidhash = SCTP_HASH_INIT(SCTP_STACK_VTAG_HASH_SIZE, &inp->hashasocidmark);
diff --git a/netinet/sctp_pcb.h b/netinet/sctp_pcb.h
index 8b6684e..d4fc288 100755
--- a/netinet/sctp_pcb.h
+++ b/netinet/sctp_pcb.h
@@ -554,7 +554,6 @@ struct sctp_inpcb {
 #if defined(__Userspace__)
 	int (*recv_callback)(struct socket*, struct sctp_queued_to_read*);
 	uint32_t send_sb_threshold;
-	uint32_t prev_send_sb_free;
 	int (*send_callback)(struct socket*, uint32_t);
 #endif
 };
diff --git a/netinet/sctp_peeloff.c b/netinet/sctp_peeloff.c
index 14257cc..23b74a1 100755
--- a/netinet/sctp_peeloff.c
+++ b/netinet/sctp_peeloff.c
@@ -151,7 +151,6 @@ sctp_do_peeloff(struct socket *head, struct socket *so, sctp_assoc_t assoc_id)
 	n_inp->recv_callback = inp->recv_callback;
 	n_inp->send_callback = inp->send_callback;
 	n_inp->send_sb_threshold = inp->send_sb_threshold;
-	n_inp->prev_send_sb_free = inp->prev_send_sb_free;
 #endif
 	/*
 	 * Now we must move it from one hash table to another and get the
@@ -249,7 +248,6 @@ sctp_get_peeloff(struct socket *head, sctp_assoc_t assoc_id, int *error)
 	n_inp->recv_callback = inp->recv_callback;
 	n_inp->send_callback = inp->send_callback;
 	n_inp->send_sb_threshold = inp->send_sb_threshold;
-	n_inp->prev_send_sb_free = inp->prev_send_sb_free;
 #endif
 
 	/* copy in the authentication parameters from the original endpoint */
diff --git a/netinet/sctp_usrreq.c b/netinet/sctp_usrreq.c
index 5c9a82e..8aad0ac 100755
--- a/netinet/sctp_usrreq.c
+++ b/netinet/sctp_usrreq.c
@@ -7432,7 +7432,6 @@ register_send_cb (struct socket* so, uint32_t sb_threshold, int (*send_cb)(struc
 	SCTP_INP_WLOCK(inp);
 	inp->send_callback = send_cb;
 	inp->send_sb_threshold = sb_threshold;
-	inp->prev_send_sb_free = 0;
 	SCTP_INP_WUNLOCK(inp);
 	/* FIXME change to current amount free. This will be the full buffer
 	 * the first time this is registered but it could be only a portion