From patchwork Thu Nov 29 03:29:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaozhou Liu X-Patchwork-Id: 1005018 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="cYHsQoeK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4353151fdwz9s47 for ; Thu, 29 Nov 2018 14:29:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727514AbeK2Odd (ORCPT ); Thu, 29 Nov 2018 09:33:33 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34308 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727026AbeK2Odd (ORCPT ); Thu, 29 Nov 2018 09:33:33 -0500 Received: by mail-pf1-f195.google.com with SMTP id h3so317189pfg.1 for ; Wed, 28 Nov 2018 19:29:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=WCsRqmGlKiyHM1YN/LQiOG/QRo7pstDX5NdF9/P5smI=; b=cYHsQoeKmsEUSHZEHffUUg57yHbmHuJC8pr1DRSvuXuXlB/nFcwIBWta7boSKnHWCk n7mgoP+sgK4llmRKqspJFy1sMER7KsFknLzMNgzgZLn5hHNmdJ4wwyNR3BsiZrgk7Wk7 KyRjiqrp4ScQ5qBS8H/nYSUeljmKA4ggU7AF2dmygLKLwUZ74pbxUw3iUbXuk25kdCEe MghuI04fchbg4O5Kkgm9sbD7UYJIro96b1euif7yqHD8jcGXZ7WUUs+/yLtA6Eih9jIy NOGw8qJO2IdfhywYnQq0Zx3L0YxIVYFaxf2VmsoxkSvmvcGmzmb+u+Hx9qbM1Cr6HV0n U95g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WCsRqmGlKiyHM1YN/LQiOG/QRo7pstDX5NdF9/P5smI=; b=JaTwFhlW72d0v+6Wfii4vw7yGF45OdxVRhPoWhDOkQLD8iFVs/DZ4K3a5giBo0EDVu veeFopDdQ5r4cLQqDombFw+qTEKe0X/9ZYTLBXSezp5eqnCI1gkg+fSm6bvMAGCYTRtZ Hf4PAOnQusaibGDL9HoIE5FP8KPHFVCrM7dN4JolvDrmTy9VSyCl178lPGanLF9pzn0K ONqods5oy7BaZ3uLWLel21edgIFovMDFqybFMwW9RBvgKbcSUHm8DFZAtTRUh6iX4hZm HGMn11pUsnLgSbcfdgDTilGehawqe5qBEK/qi8SFIYm5ELaDPNe3riuoZpkcn0ZBatpr tiaA== X-Gm-Message-State: AA+aEWam4s6uHEQR/dWB5XfklhUCB3s7TzY7zxNg0+Qvfs27GlLGF00A cuNDMqJtmyuIsCuBPw3duUHbYQ== X-Google-Smtp-Source: AFSGD/X3/8q8ruI7pgNdUIr64h/w/2Prs6vXGhyfacrbLS7lf37eBKpXv8cvbaNAFTrh/TYF2kfnrA== X-Received: by 2002:a63:20e:: with SMTP id 14mr35295489pgc.161.1543462180379; Wed, 28 Nov 2018 19:29:40 -0800 (PST) Received: from n3-021-216.byted.org ([123.58.9.240]) by smtp.gmail.com with ESMTPSA id t90sm632734pfj.23.2018.11.28.19.29.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 19:29:39 -0800 (PST) From: Xiaozhou Liu To: pablo@netfilter.org, coreteam@netfilter.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Cc: Xiaozhou Liu Subject: [PATCH] netfilter: update comment about get_unique_tuple() Date: Thu, 29 Nov 2018 11:29:05 +0800 Message-Id: <20181129032905.1148062-1-liuxiaozhou@bytedance.com> X-Mailer: git-send-email 2.11.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org `__ip_conntrack_confirm' in the comment is a bit confusing since it has long been replaced with __nf_conntrack_confirm in the code. Just update the comment. Signed-off-by: Xiaozhou Liu --- net/netfilter/nf_nat_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index e2b196054dfc..527d125964d1 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -315,7 +315,8 @@ find_best_ips_proto(const struct nf_conntrack_zone *zone, * and NF_INET_LOCAL_OUT, we change the destination to map into the * range. It might not be possible to get a unique tuple, but we try. * At worst (or if we race), we will end up with a final duplicate in - * __ip_conntrack_confirm and drop the packet. */ + * __nf_conntrack_confirm and drop the packet. + */ static void get_unique_tuple(struct nf_conntrack_tuple *tuple, const struct nf_conntrack_tuple *orig_tuple,