From patchwork Tue Sep 20 03:39:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Cardwell X-Patchwork-Id: 672065 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 3sdT5j5WbQz9sR9 for ; Tue, 20 Sep 2016 13:39:37 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=N3GWyZ35; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754002AbcITDjd (ORCPT ); Mon, 19 Sep 2016 23:39:33 -0400 Received: from mail-qk0-f171.google.com ([209.85.220.171]:34286 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753214AbcITDja (ORCPT ); Mon, 19 Sep 2016 23:39:30 -0400 Received: by mail-qk0-f171.google.com with SMTP id n185so4361140qke.1 for ; Mon, 19 Sep 2016 20:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JjKbPU0Bbp1Jbo2ZNohXRK8uaNEUqbLfjw8UCeG0PTM=; b=N3GWyZ3565sV83md0w3suXTaDlnBpqAmzfFQDaWKdaPEp5lnIozALzQSnqteXqmuPL yBO3TyAqJxH+BeUlPDuABmP3QoR+4DIIyIHDZo9vRCwoztgJmQjaUSu+r7QMNIc1i1PW l2Qm4sXqFiBJaHP7IbOp8772YYPcRYxcQEjOzdEJnqY/DCHH4Aup9+XcO86MgoQ7sTDM 5cHkNLM4/GVeXJ6jT9h+rrMlsLYbzPBYXB4ykpWN73foiOIWlF6LtDKFScx77zB9AVRq X3MzOMVuExAFM7K3cxR8HBcmCa7fUK0KmVvRHh6Er4KcwQLiOAbFTzGzO7fz5c+akRXm DU8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JjKbPU0Bbp1Jbo2ZNohXRK8uaNEUqbLfjw8UCeG0PTM=; b=JfOGpxylM8vk2xxrMHT//dAQl22e+YMppCVncUkp3WN/F/aXZlwqapwfhg/utKybVL ZZr7Lq7EXnqf6eDvD0QHEDSLQTzbV3GeKyibIZUOuRxDFF9Mc8uZURjPPcOU217wZX9U /M6OIdFlKh3mnxcssR6deanB6Ryb9tbFuZtO3zpUpisqxM3i68UPXVp8evDh0PN414nh 4hqkZFjjcQgwfD5Om80hsJ6fse0ufE1BCE3qyjyGYIsf53O3h1YaURbxAkUWw46khDMZ Lw9ikyDpViTyIsytHu11NWMecGgbi7xEeS15S+kw76H0jraNOm8+AiAcIW2UdJ42754R WzkA== X-Gm-Message-State: AE9vXwMtchwdrLUEqpikCORAIk5hshHupgmC8gZQ7k85s7A/ujZcUdh4aPfI/hWcWYN26eCx X-Received: by 10.55.56.141 with SMTP id f135mr32256795qka.73.1474342769097; Mon, 19 Sep 2016 20:39:29 -0700 (PDT) Received: from joy.nyc.corp.google.com ([100.101.230.104]) by smtp.gmail.com with ESMTPSA id m4sm14901942qkf.29.2016.09.19.20.39.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Sep 2016 20:39:28 -0700 (PDT) From: Neal Cardwell To: David Miller Cc: netdev@vger.kernel.org, Soheil Hassas Yeganeh , Neal Cardwell , Yuchung Cheng , Eric Dumazet , Kenneth Klette Jonassen Subject: [PATCH v4 net-next 01/16] tcp: cdg: rename struct minmax in tcp_cdg.c to avoid a naming conflict Date: Mon, 19 Sep 2016 23:39:08 -0400 Message-Id: <1474342763-16715-2-git-send-email-ncardwell@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1474342763-16715-1-git-send-email-ncardwell@google.com> References: <1474342763-16715-1-git-send-email-ncardwell@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Soheil Hassas Yeganeh The upcoming change "lib/win_minmax: windowed min or max estimator" introduces a struct called minmax, which is then included in include/linux/tcp.h in the upcoming change "tcp: use windowed min filter library for TCP min_rtt estimation". This would create a compilation error for tcp_cdg.c, which defines its own minmax struct. To avoid this naming conflict (and potentially others in the future), this commit renames the version used in tcp_cdg.c to cdg_minmax. Signed-off-by: Soheil Hassas Yeganeh Signed-off-by: Neal Cardwell Signed-off-by: Yuchung Cheng Signed-off-by: Eric Dumazet Cc: Kenneth Klette Jonassen Acked-by: Kenneth Klette Jonassen --- net/ipv4/tcp_cdg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/ipv4/tcp_cdg.c b/net/ipv4/tcp_cdg.c index 03725b2..35b2803 100644 --- a/net/ipv4/tcp_cdg.c +++ b/net/ipv4/tcp_cdg.c @@ -56,7 +56,7 @@ MODULE_PARM_DESC(use_shadow, "use shadow window heuristic"); module_param(use_tolerance, bool, 0644); MODULE_PARM_DESC(use_tolerance, "use loss tolerance heuristic"); -struct minmax { +struct cdg_minmax { union { struct { s32 min; @@ -74,10 +74,10 @@ enum cdg_state { }; struct cdg { - struct minmax rtt; - struct minmax rtt_prev; - struct minmax *gradients; - struct minmax gsum; + struct cdg_minmax rtt; + struct cdg_minmax rtt_prev; + struct cdg_minmax *gradients; + struct cdg_minmax gsum; bool gfilled; u8 tail; u8 state; @@ -353,7 +353,7 @@ static void tcp_cdg_cwnd_event(struct sock *sk, const enum tcp_ca_event ev) { struct cdg *ca = inet_csk_ca(sk); struct tcp_sock *tp = tcp_sk(sk); - struct minmax *gradients; + struct cdg_minmax *gradients; switch (ev) { case CA_EVENT_CWND_RESTART: