From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C40BCC48BE5 for ; Fri, 11 Jun 2021 19:05:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A67C66128A for ; Fri, 11 Jun 2021 19:05:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231192AbhFKTHi (ORCPT ); Fri, 11 Jun 2021 15:07:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230411AbhFKTHg (ORCPT ); Fri, 11 Jun 2021 15:07:36 -0400 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 222DFC0613A2 for ; Fri, 11 Jun 2021 12:05:36 -0700 (PDT) Received: by mail-il1-x12b.google.com with SMTP id b5so6107723ilc.12 for ; Fri, 11 Jun 2021 12:05:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vZEwEVBDEvCxZgVoTN4odpB95bOFDOiTrujBE+grmHw=; b=GODL4EQkGQXW7NnrcMbNEp9Q7LZU1Uas5K0o2f6nyIiJdB/Vy0H9OKhwx9CUrxvv+D bbReoR4eQEW81BQQL/T3CFaG5cYhqpshijVgZYecg8EyCu5Bqictl7u16lArAH+VC3jq lo8mXnF7nSj+82us+iIUwuktPkS1dzZaMlxlYPSXNW+ml5n6HMLW1YYRInRmmJWX9y73 xRqfUla7wO8cOGtGQPgLbLp68swLewAPgMosWlZYJ3jKO15w2FtGiD2HVJuPtUZ8Jhu6 goBLUyOeiNM+kshrpEy7lB2EsBo9tphJLgnjkj61/EwCcb2gMSsaoVhAPIiVOthIdxH8 DLTA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=vZEwEVBDEvCxZgVoTN4odpB95bOFDOiTrujBE+grmHw=; b=jJtlGl8TjW59g/EIDy2fD0KGJ8VHgqB36JN4aW37F1pn50kQ6/7iboISoFLKLqq3l0 GPsY/oDhbhBxPgbcJkKBe5QVM99/4SCKBy1bm6JPE29b4LnYwXQqB8sLBwzEn/aNZoXA 7tp16s4LPdSIxlwwmoueKHGK6tgp9O1jkJJDaYQ0zKC4cQsUEmIZXCC/gej/jCgzfLfW bKKQXEgY0DaStVLtLN/N5FEBgClbWhHkDZc2yxL8IcxXCO0Dr2/10Lt1ykTcslEr8CCk ysTcjLVDCogBq9Oegm9jgdC1A47GCLjIVmiw8wnA76ttb4pWMp0uxc6ciKNtHbYqNKoO XxAA== X-Gm-Message-State: AOAM531ljXPEAVKF2SRJ4FAWjOiR6I4LZXDLrekhFnSq+xdaRujF97x0 57GNziRGyRw9OFNaxyIEfsY8Lw== X-Google-Smtp-Source: ABdhPJwnF/bYxbZPYf7kXpBg/MRzjAcmy6m7V7CP21h6uortNQV10Cl96u+m4ikcKTn200wGkKqMtw== X-Received: by 2002:a05:6e02:1153:: with SMTP id o19mr4404755ill.136.1623438335567; Fri, 11 Jun 2021 12:05:35 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id p9sm3936566ilc.63.2021.06.11.12.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 12:05:35 -0700 (PDT) From: Alex Elder To: subashab@codeaurora.org, stranche@codeaurora.org, davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/8] net: qualcomm: rmnet: use ip_is_fragment() Date: Fri, 11 Jun 2021 14:05:22 -0500 Message-Id: <20210611190529.3085813-2-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210611190529.3085813-1-elder@linaro.org> References: <20210611190529.3085813-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In rmnet_map_ipv4_dl_csum_trailer() use ip_is_fragment() to determine whether a socket buffer contains a packet fragment. Signed-off-by: Alex Elder --- drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c index cecf72be51029..34bd1a98a1015 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c @@ -50,8 +50,9 @@ rmnet_map_ipv4_dl_csum_trailer(struct sk_buff *skb, __be16 addend; ip4h = (struct iphdr *)(skb->data); - if ((ntohs(ip4h->frag_off) & IP_MF) || - ((ntohs(ip4h->frag_off) & IP_OFFSET) > 0)) { + + /* We don't support checksum offload on IPv4 fragments */ + if (ip_is_fragment(ip4h)) { priv->stats.csum_fragmented_pkt++; return -EOPNOTSUPP; } -- 2.27.0