From patchwork Tue Mar 10 09:16:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Du X-Patchwork-Id: 448446 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 0CD57140172 for ; Tue, 10 Mar 2015 20:21:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752627AbbCJJV2 (ORCPT ); Tue, 10 Mar 2015 05:21:28 -0400 Received: from mga09.intel.com ([134.134.136.24]:53954 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751945AbbCJJV0 (ORCPT ); Tue, 10 Mar 2015 05:21:26 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 10 Mar 2015 02:19:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,373,1422950400"; d="scan'208";a="677763754" Received: from dufan-optiplex-9010.bj.intel.com ([10.238.155.116]) by fmsmga001.fm.intel.com with ESMTP; 10 Mar 2015 02:21:26 -0700 From: Fan Du To: johnwheffner@gmail.com Cc: davem@davemloft.net, netdev@vger.kernel.org, fengyuleidian0615@gmail.com Subject: [PATCH net-next 1/4] ipv4: Rename tcp_mtu_probing to tcp_blackhole_probe Date: Tue, 10 Mar 2015 17:16:23 +0800 Message-Id: <1425978986-8512-2-git-send-email-fan.du@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1425978986-8512-1-git-send-email-fan.du@intel.com> References: <1425978986-8512-1-git-send-email-fan.du@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a cosmetic patch by using tcp_blackhole_probe to clear confusion between tcp_mtu_probing and tcp_mtu_probe. In essence keep running into tcp_mtu_probing is a sign of blackhole incident. Signed-off-by: Fan Du --- net/ipv4/tcp_timer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 1550593..abde4e1 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -99,7 +99,8 @@ static int tcp_orphan_retries(struct sock *sk, int alive) return retries; } -static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk) +static void tcp_blackhole_probe(struct inet_connection_sock *icsk, + struct sock *sk) { struct net *net = sock_net(sk); @@ -177,7 +178,7 @@ static int tcp_write_timeout(struct sock *sk) } else { if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0, 0)) { /* Black hole detection */ - tcp_mtu_probing(icsk, sk); + tcp_blackhole_probe(icsk, sk); dst_negative_advice(sk); }