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

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

net: Use skb_checksum_start_offset() 



Replace skb->csum_start - skb_headroom(skb) with skb_checksum_start_offset().

Note for usb/smsc95xx: skb->data - skb->head == skb_headroom(skb).

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

drivers/net/atlx/atl1.c

+1 −1
Original line number Diff line number Diff line
@@ -2174,7 +2174,7 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb, 
	u8 css, cso;



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

		css = (u8) (skb->csum_start - skb_headroom(skb));

		css = skb_checksum_start_offset(skb);

		cso = css + (u8) skb->csum_offset;

		if (unlikely(css & 0x1)) {

			/* L1 hardware requires an even number here */

drivers/net/macvtap.c

+1 −2
Original line number Diff line number Diff line
@@ -504,8 +504,7 @@ static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb, 


	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		vnet_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;

		vnet_hdr->csum_start = skb->csum_start -

					skb_headroom(skb);

		vnet_hdr->csum_start = skb_checksum_start_offset(skb);

		vnet_hdr->csum_offset = skb->csum_offset;

	} /* else everything is zero */

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun, 


		if (skb->ip_summed == CHECKSUM_PARTIAL) {

			gso.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;

			gso.csum_start = skb->csum_start - skb_headroom(skb);

			gso.csum_start = skb_checksum_start_offset(skb);

			gso.csum_offset = skb->csum_offset;

		} /* else everything is zero */

drivers/net/usb/smsc95xx.c

+3 −4
Original line number Diff line number Diff line
@@ -1163,9 +1163,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 


static u32 smsc95xx_calc_csum_preamble(struct sk_buff *skb)

{

	int len = skb->data - skb->head;

	u16 high_16 = (u16)(skb->csum_offset + skb->csum_start - len);

	u16 low_16 = (u16)(skb->csum_start - len);

	u16 low_16 = (u16)skb_checksum_start_offset(skb);

	u16 high_16 = low_16 + skb->csum_offset;

	return (high_16 << 16) | low_16;

}
@@ -1193,7 +1192,7 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev, 
		if (skb->len <= 45) {

			/* workaround - hardware tx checksum does not work

			 * properly with extremely small packets */

			long csstart = skb->csum_start - skb_headroom(skb);

			long csstart = skb_checksum_start_offset(skb);

			__wsum calc = csum_partial(skb->data + csstart,

				skb->len - csstart, 0);

			*((__sum16 *)(skb->data + csstart

drivers/net/virtio_net.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb) 


	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		hdr->hdr.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;

		hdr->hdr.csum_start = skb->csum_start - skb_headroom(skb);

		hdr->hdr.csum_start = skb_checksum_start_offset(skb);

		hdr->hdr.csum_offset = skb->csum_offset;

	} else {

		hdr->hdr.flags = 0;