| Message ID | 1620440827-17900-1-git-send-email-yejunedeng@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | net: openvswitch: Remove unnecessary skb_nfct() | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Sat, 8 May 2021 10:27:07 +0800 you wrote: > There is no need add 'if (skb_nfct(skb))' assignment, the > nf_conntrack_put() would check it. > > Signed-off-by: Yejune Deng <yejunedeng@gmail.com> > --- > net/openvswitch/conntrack.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) Here is the summary with links: - net: openvswitch: Remove unnecessary skb_nfct() https://git.kernel.org/netdev/net-next/c/d2792e91de2b You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
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; }
There is no need add 'if (skb_nfct(skb))' assignment, the nf_conntrack_put() would check it. Signed-off-by: Yejune Deng <yejunedeng@gmail.com> --- net/openvswitch/conntrack.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)