Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d0b1672 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller
Browse files

net: Fix drivers advertising HW_CSUM feature to use csum_start 



Some drivers are using skb_transport_offset(skb) instead of skb->csum_start
for NETIF_F_HW_CSUM offload.  This does not matter now, but if someone
implements checksumming of encapsulated packets then this will break silently.

TSO output paths are left as they are, since they are for IP+TCP only
(might be worth converting though).

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55508d60

drivers/net/atl1c/atl1c_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, 
check_sum:

	if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {

		u8 css, cso;

		cso = skb_transport_offset(skb);

		cso = skb_checksum_start_offset(skb);



		if (unlikely(cso & 0x1)) {

			if (netif_msg_tx_err(adapter))

drivers/net/atl1e/atl1e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter, 
	if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {

		u8 css, cso;



		cso = skb_transport_offset(skb);

		cso = skb_checksum_start_offset(skb);

		if (unlikely(cso & 0x1)) {

			netdev_err(adapter->netdev,

				   "payload offset should not ant event number\n");

drivers/net/cassini.c

+1 −1
Original line number Diff line number Diff line
@@ -2788,7 +2788,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring, 


	ctrl = 0;

	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		const u64 csum_start_off = skb_transport_offset(skb);

		const u64 csum_start_off = skb_checksum_start_offset(skb);

		const u64 csum_stuff_off = csum_start_off + skb->csum_offset;



		ctrl =  TX_DESC_CSUM_EN |

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2726,7 +2726,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, 
		break;

	}



	css = skb_transport_offset(skb);

	css = skb_checksum_start_offset(skb);



	i = tx_ring->next_to_use;

	buffer_info = &tx_ring->buffer_info[i];

drivers/net/e1000e/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -4473,7 +4473,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb) 
		break;

	}



	css = skb_transport_offset(skb);

	css = skb_checksum_start_offset(skb);



	i = tx_ring->next_to_use;

	buffer_info = &tx_ring->buffer_info[i];