From: Jesse Brandeburg <jesse.brandeburg@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH net-next v2 08/11] intel: call csum functions with well formatted arguments
Date: Thu, 25 Mar 2021 17:38:31 -0700 [thread overview]
Message-ID: <20210326003834.3886241-9-jesse.brandeburg@intel.com> (raw)
In-Reply-To: <20210326003834.3886241-1-jesse.brandeburg@intel.com>
The sparse build (C=2) found that there were two drivers
who had not been convered to call the csum_replace_by_diff() function
with sparse clean arguments. Most if not all drivers force the cast
like this patch does. So these drivers are now joining the party
(a bit late), but with no functional change.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
---
Warning Detail:
.../igbvf/netdev.c:2059:46: warning: incorrect type in argument 2 (different base types)
.../igbvf/netdev.c:2059:46: expected restricted __wsum [usertype] diff
.../igbvf/netdev.c:2059:46: got restricted __be32 [usertype]
.../ixgbevf/ixgbevf_main.c:3817:46: warning: incorrect type in argument 2 (different base types)
.../ixgbevf/ixgbevf_main.c:3817:46: expected restricted __wsum [usertype] diff
.../ixgbevf/ixgbevf_main.c:3817:46: got restricted __be32 [usertype]
---
drivers/net/ethernet/intel/igbvf/netdev.c | 2 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 630c1155f196..1bbe9862a758 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2056,7 +2056,7 @@ static int igbvf_tso(struct igbvf_ring *tx_ring,
/* remove payload length from inner checksum */
paylen = skb->len - l4_offset;
- csum_replace_by_diff(&l4.tcp->check, htonl(paylen));
+ csum_replace_by_diff(&l4.tcp->check, (__force __wsum)htonl(paylen));
/* MSS L4LEN IDX */
mss_l4len_idx = (*hdr_len - l4_offset) << E1000_ADVTXD_L4LEN_SHIFT;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index ba2ed8a43d2d..588c3aa50d94 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3814,7 +3814,7 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring,
/* remove payload length from inner checksum */
paylen = skb->len - l4_offset;
- csum_replace_by_diff(&l4.tcp->check, htonl(paylen));
+ csum_replace_by_diff(&l4.tcp->check, (__force __wsum)htonl(paylen));
/* update gso size and bytecount with header size */
first->gso_segs = skb_shinfo(skb)->gso_segs;
--
2.30.2
next prev parent reply other threads:[~2021-03-26 0:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 0:38 [Intel-wired-lan] [PATCH net-next v2 00/11] warning cleanups Jesse Brandeburg
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 01/11] e100: handle eeprom as little endian Jesse Brandeburg
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 02/11] intel: remove checker warning Jesse Brandeburg
2021-04-22 22:53 ` Switzer, David
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 03/11] fm10k: move error check Jesse Brandeburg
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 04/11] igb/igc: use strongly typed pointer Jesse Brandeburg
2021-04-11 7:09 ` Dvora Fuxbrumer
2021-04-22 22:06 ` Switzer, David
2021-04-22 23:11 ` Switzer, David
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 05/11] igb: handle vlan types with checker enabled Jesse Brandeburg
2021-04-22 22:08 ` Switzer, David
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 06/11] igb: fix assignment on big endian machines Jesse Brandeburg
2021-04-22 22:10 ` Switzer, David
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 07/11] igb: override two checker warnings Jesse Brandeburg
2021-04-22 22:09 ` Switzer, David
2021-03-26 0:38 ` Jesse Brandeburg [this message]
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 09/11] igbvf: convert to strongly typed descriptors Jesse Brandeburg
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 10/11] ixgbe: use checker safe conversions Jesse Brandeburg
2021-04-23 22:38 ` Switzer, David
2021-03-26 0:38 ` [Intel-wired-lan] [PATCH net-next v2 11/11] ixgbe: reduce checker warnings Jesse Brandeburg
2021-03-26 1:32 ` Shannon Nelson
2021-04-23 22:39 ` Switzer, David
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210326003834.3886241-9-jesse.brandeburg@intel.com \
--to=jesse.brandeburg@intel.com \
--cc=intel-wired-lan@osuosl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox