]> git.karo-electronics.de Git - linux-beck.git/commitdiff
i40e/i40evf: Fix casting in transmit code
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Thu, 10 Mar 2016 22:59:39 +0000 (14:59 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 5 Apr 2016 09:05:34 +0000 (02:05 -0700)
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>
drivers/net/ethernet/intel/i40e/i40e_txrx.c
drivers/net/ethernet/intel/i40evf/i40e_txrx.c

index 01cff073f8db6c71cc65947864776ab082f96da1..5bef5b0f00d9bce9408b024101470ad15f2303d3 100644 (file)
@@ -2305,7 +2305,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);
                }
 
@@ -2327,7 +2328,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 */
index 9e911363c11b066e9bad2fca78c2b63c0191c847..570348d93e5dc718324d745606fd867c270fd0fb 100644 (file)
@@ -1572,7 +1572,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);
                }
 
@@ -1594,7 +1595,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 */