Commit dca9d62a authored by Zhang Changzhong's avatar Zhang Changzhong Committed by Jakub Kicinski
Browse files

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: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1723730983-22912-1-git-send-email-zhangchangzhong@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent af3dc0ad

net/core/skbuff.c

+1 −2
Original line number Diff line number Diff line
@@ -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 {