From 825d0efb5a03a7137f41a441bf76a626aafc8011 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 22 Jul 2008 14:20:45 -0700 Subject: [PATCH] --- yaml --- r: 104883 b: refs/heads/master c: abd0b198ea699578c3c3476d646c91842e19dbd2 h: refs/heads/master i: 104881: 6609181c546206acd69ddea7a645e36e20b7fa27 104879: 23ed21b0e2b97745c12c4285cecb56d84c15717e v: v3 --- [refs] | 2 +- trunk/include/net/sctp/structs.h | 1 - trunk/net/sctp/outqueue.c | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ec76e961666d..c6c29c2032e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a94f779f9d82eb2d758a8715eaae5df98e8dcb21 +refs/heads/master: abd0b198ea699578c3c3476d646c91842e19dbd2 diff --git a/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h index 70eb64a7e1a1..535a18f57a13 100644 --- a/trunk/include/net/sctp/structs.h +++ b/trunk/include/net/sctp/structs.h @@ -1161,7 +1161,6 @@ void sctp_outq_init(struct sctp_association *, struct sctp_outq *); void sctp_outq_teardown(struct sctp_outq *); void sctp_outq_free(struct sctp_outq*); int sctp_outq_tail(struct sctp_outq *, struct sctp_chunk *chunk); -int sctp_outq_flush(struct sctp_outq *, int); int sctp_outq_sack(struct sctp_outq *, struct sctp_sackhdr *); int sctp_outq_is_empty(const struct sctp_outq *); void sctp_outq_restart(struct sctp_outq *); diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c index 70ead8dc3485..4328ad5439c9 100644 --- a/trunk/net/sctp/outqueue.c +++ b/trunk/net/sctp/outqueue.c @@ -71,6 +71,8 @@ static void sctp_mark_missing(struct sctp_outq *q, static void sctp_generate_fwdtsn(struct sctp_outq *q, __u32 sack_ctsn); +static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout); + /* Add data to the front of the queue. */ static inline void sctp_outq_head_data(struct sctp_outq *q, struct sctp_chunk *ch) @@ -712,7 +714,7 @@ int sctp_outq_uncork(struct sctp_outq *q) * locking concerns must be made. Today we use the sock lock to protect * this function. */ -int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) +static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) { struct sctp_packet *packet; struct sctp_packet singleton;