From patchwork Thu Oct 20 21:11:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 120889 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E69CB1007D2 for ; Fri, 21 Oct 2011 08:11:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753155Ab1JTVLa (ORCPT ); Thu, 20 Oct 2011 17:11:30 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:34970 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752669Ab1JTVL3 (ORCPT ); Thu, 20 Oct 2011 17:11:29 -0400 Received: by wyg36 with SMTP id 36so3335939wyg.19 for ; Thu, 20 Oct 2011 14:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=y3fqYpCejuZUBC0AcYs/2WpEwSu0ReKIXMBEuTdlbEE=; b=SnL3vw3BpUhZ6pQCXxNFEk3rG29Zyz/KYOi3YkyGqdnkhEIRgdLj5WlR1myjMdM2TQ z7gjQvFX0wCyyZUHlzGAuAz3Kjz8BZfsa3NZt8NIIYYJNubkCMrUJ778CQH1sR3fLt3r jKvcKf2qVQgG3U3xuVHl9QGNeSsE0EtpMa/1s= Received: by 10.227.196.6 with SMTP id ee6mr4528599wbb.59.1319145087975; Thu, 20 Oct 2011 14:11:27 -0700 (PDT) Received: from [10.170.237.4] ([87.255.129.107]) by mx.google.com with ESMTPS id h39sm17876031wbo.0.2011.10.20.14.11.26 (version=SSLv3 cipher=OTHER); Thu, 20 Oct 2011 14:11:27 -0700 (PDT) Message-ID: <1319145084.2854.42.camel@edumazet-laptop> Subject: [PATCH net-next] tcp: remove unused tcp_fin() parameters From: Eric Dumazet To: David Miller Cc: netdev Date: Thu, 20 Oct 2011 23:11:24 +0200 X-Mailer: Evolution 3.2.0- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tcp_fin() only needs socket pointer, we can remove skb and th params. Signed-off-by: Eric Dumazet --- net/ipv4/tcp_input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" 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/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1e848b2..6f7fef9 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4127,7 +4127,7 @@ static void tcp_reset(struct sock *sk) * * If we are in FINWAIT-2, a received FIN moves us to TIME-WAIT. */ -static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th) +static void tcp_fin(struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); @@ -4398,7 +4398,7 @@ static void tcp_ofo_queue(struct sock *sk) __skb_queue_tail(&sk->sk_receive_queue, skb); tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq; if (tcp_hdr(skb)->fin) - tcp_fin(skb, sk, tcp_hdr(skb)); + tcp_fin(sk); } } @@ -4480,7 +4480,7 @@ queue_and_out: if (skb->len) tcp_event_data_recv(sk, skb); if (th->fin) - tcp_fin(skb, sk, th); + tcp_fin(sk); if (!skb_queue_empty(&tp->out_of_order_queue)) { tcp_ofo_queue(sk);