From patchwork Thu Aug 27 11:17:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 1352644 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BcmYz5WhNz9sTj for ; Fri, 28 Aug 2020 01:17:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728405AbgH0PRa (ORCPT ); Thu, 27 Aug 2020 11:17:30 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:10285 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728753AbgH0Lge (ORCPT ); Thu, 27 Aug 2020 07:36:34 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id EBEC1A285DC439BF461F; Thu, 27 Aug 2020 19:19:15 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Thu, 27 Aug 2020 19:19:07 +0800 From: Miaohe Lin To: , , , , , , , , , , CC: , , Subject: [PATCH] net: Call ip_hdrlen() when skbuff is not fragment Date: Thu, 27 Aug 2020 07:17:59 -0400 Message-ID: <20200827111759.40336-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When skbuff is fragment, we exit immediately and leave ip_hdrlen() as unused. And remove the unnecessary local variable fragment. Signed-off-by: Miaohe Lin --- net/core/skbuff.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4dc92290becd..0b24aed04060 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4843,28 +4843,20 @@ static __sum16 *skb_checksum_setup_ip(struct sk_buff *skb, static int skb_checksum_setup_ipv4(struct sk_buff *skb, bool recalculate) { unsigned int off; - bool fragment; __sum16 *csum; int err; - fragment = false; - err = skb_maybe_pull_tail(skb, sizeof(struct iphdr), MAX_IP_HDR_LEN); if (err < 0) goto out; - if (ip_is_fragment(ip_hdr(skb))) - fragment = true; - - off = ip_hdrlen(skb); - err = -EPROTO; - - if (fragment) + if (ip_is_fragment(ip_hdr(skb))) goto out; + off = ip_hdrlen(skb); csum = skb_checksum_setup_ip(skb, ip_hdr(skb)->protocol, off); if (IS_ERR(csum)) return PTR_ERR(csum);