Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp712237pxj; Fri, 7 May 2021 19:29:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKeHjSTe8UDVZ5et3cxP0+I3y1HzeXenwj2WeA3U8hoiF1gns8xIZXjQQyg7tegJ6t2eFK X-Received: by 2002:a17:907:960b:: with SMTP id gb11mr13330763ejc.123.1620440954628; Fri, 07 May 2021 19:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620440954; cv=none; d=google.com; s=arc-20160816; b=Wz5MxiOff/rhY1vOog8lkjbqQVhVl4C7RdN9oT/jcx7EJARo0bObGhVlVko7MxKg0L PvShEfX7Y2j2bE+1eBvDSqwNfMjK6EmSW+t5PJPrnDzgXsgwG6ZdXhksH5D3yR8QPiNM s6x+vxSh8Jb1fF7Zzt2W89QU3tRtf9/ryI8ETJe6FJdtUFlhQfxT1dWB1bJ2P746vM+7 IaR5ja1qUgxsNqiJGsJO1M/DJehkPODxa9kqod2KEjAe7DSfm55qdIVtVrhOc6oTaBRy /i6ujFKLR/SiL/zLGG0j1E77mTFt25k5jxMDPTwB3USSaqFQ91SGo14LIZwFZdAp8f8c /Q9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=uqMc5TvTB6yCdyyHMniBnZIZU+s48UD4fCLr5hBdMZQ=; b=j97FKWBhmIDBh3emuO4e5hxdmmbR4gh6M/2PFpkrn2IpmjaOuCatUw4My0MiD2FRV4 Gt/ZqoDsKufG+stWcCoRBW2tIRXvXTzxUh+wh6Po2GwkTgzQoBL1YDjEGlI6j/WenlTe J6VmMr9ICRqYdpb6q+xPDToamzA6mLQb9Y3GC4DuRWwvtHu9uXaj20KWgRH6pXTNBzMq 9dPGaAurFtefeBLrLfWY21g9mG8n6ylGDpeQSYi2Piq9mXqIZNENoDkILqo2QyNWMAzI AvzUyY8p73FJnFy6swi8j4w/QcsBziTSn3bBGqfoxjsqXsHeX54cfHJei8yqQBTKar2C MojA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Lnon4udL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g20si5268248ejc.561.2021.05.07.19.28.50; Fri, 07 May 2021 19:29:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Lnon4udL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230332AbhEHC2Z (ORCPT + 99 others); Fri, 7 May 2021 22:28:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229775AbhEHC2Y (ORCPT ); Fri, 7 May 2021 22:28:24 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6835AC061574; Fri, 7 May 2021 19:27:23 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id a5so2139771pfa.11; Fri, 07 May 2021 19:27:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uqMc5TvTB6yCdyyHMniBnZIZU+s48UD4fCLr5hBdMZQ=; b=Lnon4udLZ6q+y8nRL31yw6YDvb0EgZOfmfoVJcNtq2/wTv3RHE1huDbT7BA78ckQb1 F35HmiWMRxAz81ZCJf7PJ283mEdqHBfyuOmbLtefP4rgg8lnQI12qYGNK6A7ferPlOwI 3RNi6LzhBPsU4Qwfc/RxT8pA8/OHRvE3145v518h+kZwPOlQWwAeCENKu5sZ+hIcBs4K VLuDm3ZBae94FRFZGcp9Z37Q9SiDUkjLQq7ZTK6tkPVt/JzfzZ8oTPbtHbSG15JnKbnW o9JGKQPLxNQ88Cpn05l91oqkgWmt0+pXZPubj0g+b2IqZdeoL/loo4sHL+04D01esJOX fmQA== 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=uqMc5TvTB6yCdyyHMniBnZIZU+s48UD4fCLr5hBdMZQ=; b=Uuo2Z58LeD8ecuijqp40DHrf6eK/BU/VdTdZzlCFnVzy4GZXM43zjoF5VCZMlur8iw lT4i6ps/A2hjGqYjhDOCwTLyrRptPU3W9in998C3mzXb1MHKS8sKvDMNzYZEuwGxNhoY WPRpYPYtaB2nniKJBAOdszfZn/RZRHJCNQ6cLUJcqwVu0uHEqZmCtGxjkL3GRjG3ZFYp FjD1oh9e0UlFuIYBWOIrq0CCq86UqjAk4yrj5GlBjGo9mEXjli5QlGhM4KqHEELCc0uB 0XC5AY2MHucXhgtwO//y2LUaMQWtLT+JZUP/vklCBWV/Sj95CWON3HfXyM3b1YbeCXwb Yd1A== X-Gm-Message-State: AOAM532qCDYa3ONhI/vSu25vRn9DTbkUh6it6xlAgTLLeA6WkWSJ62VW mmNcMqMCfZn11i+sklLRbJY2R6j1D02l4shs5u4= X-Received: by 2002:a63:cc43:: with SMTP id q3mr13240897pgi.50.1620440843080; Fri, 07 May 2021 19:27:23 -0700 (PDT) Received: from sz-dl-056.autox.sz ([45.67.53.159]) by smtp.gmail.com with ESMTPSA id t19sm5884811pfg.100.2021.05.07.19.27.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 May 2021 19:27:22 -0700 (PDT) From: Yejune Deng X-Google-Original-From: Yejune Deng To: pshelar@ovn.org, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yejune Deng Subject: [PATCH] net: openvswitch: Remove unnecessary skb_nfct() Date: Sat, 8 May 2021 10:27:07 +0800 Message-Id: <1620440827-17900-1-git-send-email-yejunedeng@gmail.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need add 'if (skb_nfct(skb))' assignment, the nf_conntrack_put() would check it. Signed-off-by: Yejune Deng --- net/openvswitch/conntrack.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index cadb6a2..1b5eae5 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -967,8 +967,7 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, /* Associate skb with specified zone. */ if (tmpl) { - if (skb_nfct(skb)) - nf_conntrack_put(skb_nfct(skb)); + nf_conntrack_put(skb_nfct(skb)); nf_conntrack_get(&tmpl->ct_general); nf_ct_set(skb, tmpl, IP_CT_NEW); } @@ -1329,11 +1328,9 @@ int ovs_ct_execute(struct net *net, struct sk_buff *skb, int ovs_ct_clear(struct sk_buff *skb, struct sw_flow_key *key) { - if (skb_nfct(skb)) { - nf_conntrack_put(skb_nfct(skb)); - nf_ct_set(skb, NULL, IP_CT_UNTRACKED); - ovs_ct_fill_key(skb, key, false); - } + nf_conntrack_put(skb_nfct(skb)); + nf_ct_set(skb, NULL, IP_CT_UNTRACKED); + ovs_ct_fill_key(skb, key, false); return 0; } -- 2.7.4