diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-07-22 17:20:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-22 17:20:45 -0400 |
| commit | abd0b198ea699578c3c3476d646c91842e19dbd2 (patch) | |
| tree | 7fd20239f80d1cad22e9023d3c481944b81a198a | |
| parent | a94f779f9d82eb2d758a8715eaae5df98e8dcb21 (diff) | |
sctp: make sctp_outq_flush() static
sctp_outq_flush() can now become static.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sctp/structs.h | 1 | ||||
| -rw-r--r-- | net/sctp/outqueue.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 70eb64a7e1a1..535a18f57a13 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -1161,7 +1161,6 @@ void sctp_outq_init(struct sctp_association *, struct sctp_outq *); | |||
| 1161 | void sctp_outq_teardown(struct sctp_outq *); | 1161 | void sctp_outq_teardown(struct sctp_outq *); |
| 1162 | void sctp_outq_free(struct sctp_outq*); | 1162 | void sctp_outq_free(struct sctp_outq*); |
| 1163 | int sctp_outq_tail(struct sctp_outq *, struct sctp_chunk *chunk); | 1163 | int sctp_outq_tail(struct sctp_outq *, struct sctp_chunk *chunk); |
| 1164 | int sctp_outq_flush(struct sctp_outq *, int); | ||
| 1165 | int sctp_outq_sack(struct sctp_outq *, struct sctp_sackhdr *); | 1164 | int sctp_outq_sack(struct sctp_outq *, struct sctp_sackhdr *); |
| 1166 | int sctp_outq_is_empty(const struct sctp_outq *); | 1165 | int sctp_outq_is_empty(const struct sctp_outq *); |
| 1167 | void sctp_outq_restart(struct sctp_outq *); | 1166 | void sctp_outq_restart(struct sctp_outq *); |
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 70ead8dc3485..4328ad5439c9 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
| @@ -71,6 +71,8 @@ static void sctp_mark_missing(struct sctp_outq *q, | |||
| 71 | 71 | ||
| 72 | static void sctp_generate_fwdtsn(struct sctp_outq *q, __u32 sack_ctsn); | 72 | static void sctp_generate_fwdtsn(struct sctp_outq *q, __u32 sack_ctsn); |
| 73 | 73 | ||
| 74 | static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout); | ||
| 75 | |||
| 74 | /* Add data to the front of the queue. */ | 76 | /* Add data to the front of the queue. */ |
| 75 | static inline void sctp_outq_head_data(struct sctp_outq *q, | 77 | static inline void sctp_outq_head_data(struct sctp_outq *q, |
| 76 | struct sctp_chunk *ch) | 78 | struct sctp_chunk *ch) |
| @@ -712,7 +714,7 @@ int sctp_outq_uncork(struct sctp_outq *q) | |||
| 712 | * locking concerns must be made. Today we use the sock lock to protect | 714 | * locking concerns must be made. Today we use the sock lock to protect |
| 713 | * this function. | 715 | * this function. |
| 714 | */ | 716 | */ |
| 715 | int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) | 717 | static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) |
| 716 | { | 718 | { |
| 717 | struct sctp_packet *packet; | 719 | struct sctp_packet *packet; |
| 718 | struct sctp_packet singleton; | 720 | struct sctp_packet singleton; |
