From dca9d62a0d7684a5510645ba05960529c5066457 Mon Sep 17 00:00:00 2001 From: Zhang Changzhong Date: Thu, 15 Aug 2024 22:09:42 +0800 Subject: [PATCH] net: remove redundant check in skb_shift() The check for '!to' is redundant here, since skb_can_coalesce() already contains this check. Signed-off-by: Zhang Changzhong Reviewed-by: Simon Horman Link: https://patch.msgid.link/1723730983-22912-1-git-send-email-zhangchangzhong@huawei.com Signed-off-by: Jakub Kicinski --- net/core/skbuff.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index de2a044cc665..1748673e1fe0 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4172,8 +4172,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen) /* Actual merge is delayed until the point when we know we can * commit all, so that we don't have to undo partial changes */ - if (!to || - !skb_can_coalesce(tgt, to, skb_frag_page(fragfrom), + if (!skb_can_coalesce(tgt, to, skb_frag_page(fragfrom), skb_frag_off(fragfrom))) { merge = -1; } else {