From patchwork Tue Jan 14 00:47:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 3482431 X-Patchwork-Delegate: dan.j.williams@gmail.com Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 65EAB9F169 for ; Tue, 14 Jan 2014 00:48:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99C4620166 for ; Tue, 14 Jan 2014 00:48:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B07152015E for ; Tue, 14 Jan 2014 00:48:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754574AbaANAsF (ORCPT ); Mon, 13 Jan 2014 19:48:05 -0500 Received: from mga09.intel.com ([134.134.136.24]:48755 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753632AbaANAsC (ORCPT ); Mon, 13 Jan 2014 19:48:02 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 13 Jan 2014 16:44:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,656,1384329600"; d="scan'208";a="466140926" Received: from viggo.jf.intel.com ([10.23.232.61]) by orsmga002.jf.intel.com with ESMTP; 13 Jan 2014 16:47:59 -0800 Subject: [PATCH v3 3/4] net: make tcp_cleanup_rbuf private From: Dan Williams To: dmaengine@vger.kernel.org Cc: Hideaki YOSHIFUJI , netdev@vger.kernel.org, James Morris , Patrick McHardy , Alexey Kuznetsov , Neal Cardwell , "David S. Miller" , linux-kernel@vger.kernel.org Date: Mon, 13 Jan 2014 16:47:59 -0800 Message-ID: <20140114004719.27138.21488.stgit@viggo.jf.intel.com> In-Reply-To: <20140114004509.27138.50345.stgit@viggo.jf.intel.com> References: <20140114004509.27138.50345.stgit@viggo.jf.intel.com> User-Agent: StGit/0.17.1-3-g7cb9 MIME-Version: 1.0 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP net_dma was the only external user so this can become local to tcp.c again. Cc: James Morris Cc: Patrick McHardy Cc: Alexey Kuznetsov Cc: Hideaki YOSHIFUJI Acked-by: Neal Cardwell Acked-by: David S. Miller Signed-off-by: Dan Williams --- Since v1: keep the tcp_ prefix. include/net/tcp.h | 1 - net/ipv4/tcp.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/tcp.h b/include/net/tcp.h index 084c163e9d40..571036b3bead 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -370,7 +370,6 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, void tcp_rcv_established(struct sock *sk, struct sk_buff *skb, const struct tcphdr *th, unsigned int len); void tcp_rcv_space_adjust(struct sock *sk); -void tcp_cleanup_rbuf(struct sock *sk, int copied); int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp); void tcp_twsk_destructor(struct sock *sk); ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos, diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8dc913dfbaef..10dda80fccc9 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1332,7 +1332,7 @@ static int tcp_peek_sndq(struct sock *sk, struct msghdr *msg, int len) * calculation of whether or not we must ACK for the sake of * a window update. */ -void tcp_cleanup_rbuf(struct sock *sk, int copied) +static void tcp_cleanup_rbuf(struct sock *sk, int copied) { struct tcp_sock *tp = tcp_sk(sk); bool time_to_ack = false;