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,URIBL_BLOCKED, 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 4CD2EC43331 for ; Sat, 6 Mar 2021 03:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D39265013 for ; Sat, 6 Mar 2021 03:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230047AbhCFDQe (ORCPT ); Fri, 5 Mar 2021 22:16:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbhCFDP7 (ORCPT ); Fri, 5 Mar 2021 22:15:59 -0500 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38625C061763 for ; Fri, 5 Mar 2021 19:15:57 -0800 (PST) Received: by mail-io1-xd2e.google.com with SMTP id i8so4147387iog.7 for ; Fri, 05 Mar 2021 19:15:57 -0800 (PST) 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=cYtxP12FPoFyXStxU+dIm5i6FSzaCM643MO9iKA6Wx4=; b=g6WXRn347j7pmgYD2zoZKiQgCwOofJv+sDMycNiZfHjV+4kUFyOaqWKZdkkhUNvuCL /LW3sRYmJ+vhfn4A4JjQt6sODuznGgWlOPRvihgZorv5LKW0/CrU+BrBcZ0sDTea7En5 HeW6hMGRwApLSX87LhzywnKtvCU/bUl39Dtj1OwgiC7b3rTDirJ8T6Z2U1t5oDdtKjfZ QsS9G3IQFKVcxb2c+tKbWL6B6u6f780oewXnHJFtnQ3+ybEpSITiSvV1Niw6FGf7dpti UzmTGSWFyDzdpa3w29sfg0+xqOXRaGb+V31kjrtiflO6NZb63K76zNZWXHD4ONgkWMaF iQDw== 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=cYtxP12FPoFyXStxU+dIm5i6FSzaCM643MO9iKA6Wx4=; b=PO8/OMVGIef5zo1XV6HEai+uJRB/IbLFC5EmkncItV3m8NbWIQVBRUYzkhKfG0y9Od 57IZRniy0wE8h9GKUGe5T/kSZQlKfQ1a7jKOtN0/iZJhRqVyuuJYV2I6Cm4oM8BeoEXA HxDnpQ88IUGpnWAtfnVprfAfc/erSvfELpgdkl7QFlMZQV+39sY6Sz8cxysnwFo4Rtll D8mkbky53jjJqQgltlOqBwOza9EOvSDsZa6DDQOVUsf/oF/aTevV/qsNmXtpJ3BeeBjm iFGcm6jDxryd++l98Aaoertx0U43Fk1gi++9vW2D++pyPj5YrT8fmUC3nTfAU7BgRLuV itWw== X-Gm-Message-State: AOAM530LpQmwj3odqWygJbJSzN1OcsD8q4RMA4X/8kCEbmmfKYw5FU8u pKrbYhSrIVqnezMqObI+YRgqgg== X-Google-Smtp-Source: ABdhPJzA7ZuEMbrE2NlnY5ZV6OrIViNoSkIfmJCitFgOOys+iYZoiJ8sHXCOu9dMBhc7RbBHV1uVIg== X-Received: by 2002:a02:9003:: with SMTP id w3mr12920361jaf.31.1615000556740; Fri, 05 Mar 2021 19:15:56 -0800 (PST) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id i67sm2278693ioa.3.2021.03.05.19.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 19:15:56 -0800 (PST) From: Alex Elder To: subashab@codeaurora.org, stranche@codeaurora.org, davem@davemloft.net, kuba@kernel.org Cc: sharathv@codeaurora.org, bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/6] net: qualcomm: rmnet: simplify some byte order logic Date: Fri, 5 Mar 2021 21:15:46 -0600 Message-Id: <20210306031550.26530-3-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210306031550.26530-1-elder@linaro.org> References: <20210306031550.26530-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_ul_csum_header() and rmnet_map_ipv6_ul_csum_header() the offset within a packet at which checksumming should commence is calculated. This calculation involves byte swapping and a forced type conversion that makes it hard to understand. Simplify this by computing the offset in host byte order, then converting the result when assigning it into the header field. Signed-off-by: Alex Elder Reviewed-by: Bjorn Andersson --- .../ethernet/qualcomm/rmnet/rmnet_map_data.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c index 21d38167f9618..bd1aa11c9ce59 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c @@ -197,12 +197,13 @@ rmnet_map_ipv4_ul_csum_header(void *iphdr, struct rmnet_map_ul_csum_header *ul_header, struct sk_buff *skb) { - struct iphdr *ip4h = (struct iphdr *)iphdr; - __be16 *hdr = (__be16 *)ul_header, offset; + __be16 *hdr = (__be16 *)ul_header; + struct iphdr *ip4h = iphdr; + u16 offset; + + offset = skb_transport_header(skb) - (unsigned char *)iphdr; + ul_header->csum_start_offset = htons(offset); - offset = htons((__force u16)(skb_transport_header(skb) - - (unsigned char *)iphdr)); - ul_header->csum_start_offset = offset; ul_header->csum_insert_offset = skb->csum_offset; ul_header->csum_enabled = 1; if (ip4h->protocol == IPPROTO_UDP) @@ -239,12 +240,13 @@ rmnet_map_ipv6_ul_csum_header(void *ip6hdr, struct rmnet_map_ul_csum_header *ul_header, struct sk_buff *skb) { - struct ipv6hdr *ip6h = (struct ipv6hdr *)ip6hdr; - __be16 *hdr = (__be16 *)ul_header, offset; + __be16 *hdr = (__be16 *)ul_header; + struct ipv6hdr *ip6h = ip6hdr; + u16 offset; + + offset = skb_transport_header(skb) - (unsigned char *)ip6hdr; + ul_header->csum_start_offset = htons(offset); - offset = htons((__force u16)(skb_transport_header(skb) - - (unsigned char *)ip6hdr)); - ul_header->csum_start_offset = offset; ul_header->csum_insert_offset = skb->csum_offset; ul_header->csum_enabled = 1; -- 2.27.0