aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2013-12-30 20:12:07 -0500
committerDan Williams <dan.j.williams@intel.com>2014-09-28 10:22:21 -0400
commit3f334078567245429540e6461c81c749fce87f70 (patch)
tree103372c10a443aa7fbd2014bc4a3810a31be82c2
parentd27f9bc104375a0a835cf68bb88fc9cec69125da (diff)
net: make tcp_cleanup_rbuf private
net_dma was the only external user so this can become local to tcp.c again. Cc: James Morris <jmorris@namei.org> Cc: Patrick McHardy <kaber@trash.net> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Acked-by: Neal Cardwell <ncardwell@google.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--include/net/tcp.h1
-rw-r--r--net/ipv4/tcp.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 2c2f24ffa383..7ffbcbf90a64 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -371,7 +371,6 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
371void tcp_rcv_established(struct sock *sk, struct sk_buff *skb, 371void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
372 const struct tcphdr *th, unsigned int len); 372 const struct tcphdr *th, unsigned int len);
373void tcp_rcv_space_adjust(struct sock *sk); 373void tcp_rcv_space_adjust(struct sock *sk);
374void tcp_cleanup_rbuf(struct sock *sk, int copied);
375int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp); 374int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
376void tcp_twsk_destructor(struct sock *sk); 375void tcp_twsk_destructor(struct sock *sk);
377ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos, 376ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos,
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 28595a364f09..4874a0efd34a 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1377,7 +1377,7 @@ static int tcp_peek_sndq(struct sock *sk, struct msghdr *msg, int len)
1377 * calculation of whether or not we must ACK for the sake of 1377 * calculation of whether or not we must ACK for the sake of
1378 * a window update. 1378 * a window update.
1379 */ 1379 */
1380void tcp_cleanup_rbuf(struct sock *sk, int copied) 1380static void tcp_cleanup_rbuf(struct sock *sk, int copied)
1381{ 1381{
1382 struct tcp_sock *tp = tcp_sk(sk); 1382 struct tcp_sock *tp = tcp_sk(sk);
1383 bool time_to_ack = false; 1383 bool time_to_ack = false;