i40e/i40evf: Fix casting in transmit code

Orabug: 23176970

Simple cast to fix a sparse warning.

Fixes: commit 5453205cd097 ("i40e/i40evf: Enable support for
SKB_GSO_UDP_TUNNEL_CSUM")

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 4ea623922d1d73c162da53e02cce1d0d3fd55893)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index d18a874ad6c01f7778418baafcc56fbe05f9c7bc..6737f0d0738447d3bd1cce55a78a69d6a19ef81d 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2302,7 +2302,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
 
                        /* remove payload length from outer checksum */
                        paylen = (__force u16)l4.udp->check;
-                       paylen += ntohs(1) * (u16)~(skb->len - l4_offset);
+                       paylen += ntohs((__force __be16)1) *
+                                       (u16)~(skb->len - l4_offset);
                        l4.udp->check = ~csum_fold((__force __wsum)paylen);
                }
 
@@ -2324,7 +2325,7 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
 
        /* remove payload length from inner checksum */
        paylen = (__force u16)l4.tcp->check;
-       paylen += ntohs(1) * (u16)~(skb->len - l4_offset);
+       paylen += ntohs((__force __be16)1) * (u16)~(skb->len - l4_offset);
        l4.tcp->check = ~csum_fold((__force __wsum)paylen);
 
        /* compute length of segmentation header */

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 9d857ceea3cc4c926a7ad5d9a9ea4a005936af2b..45c1367e8ff96f216cc4b55e071103bc68293a4c 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1569,7 +1569,8 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
 
                        /* remove payload length from outer checksum */
                        paylen = (__force u16)l4.udp->check;
-                       paylen += ntohs(1) * (u16)~(skb->len - l4_offset);
+                       paylen += ntohs((__force __be16)1) *
+                                       (u16)~(skb->len - l4_offset);
                        l4.udp->check = ~csum_fold((__force __wsum)paylen);
                }
 
@@ -1591,7 +1592,7 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
 
        /* remove payload length from inner checksum */
        paylen = (__force u16)l4.tcp->check;
-       paylen += ntohs(1) * (u16)~(skb->len - l4_offset);
+       paylen += ntohs((__force __be16)1) * (u16)~(skb->len - l4_offset);
        l4.tcp->check = ~csum_fold((__force __wsum)paylen);
 
        /* compute length of segmentation header */