Commit ea2ae17d authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: Introduce skb_transport_offset() 



For the quite common 'skb->h.raw - skb->data' sequence.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent badff6d0

drivers/net/atl1/atl1_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1326,8 +1326,8 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb, 
	u8 css, cso;



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

		cso = skb->h.raw - skb->data;

		css = (skb->h.raw + skb->csum_offset) - skb->data;

		cso = skb_transport_offset(skb);

		css = cso + skb->csum;

		if (unlikely(cso & 0x1)) {

			printk(KERN_DEBUG "%s: payload offset != even number\n",

				atl1_driver_name);
@@ -1369,8 +1369,8 @@ static void atl1_tx_map(struct atl1_adapter *adapter, 


	if (tcp_seg) {

		/* TSO/GSO */

		proto_hdr_len =

		    ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));

		proto_hdr_len = (skb_transport_offset(skb) +

				 (skb->h.th->doff << 2));

		buffer_info->length = proto_hdr_len;

		page = virt_to_page(skb->data);

		offset = (unsigned long)skb->data & ~PAGE_MASK;
@@ -1562,7 +1562,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	mss = skb_shinfo(skb)->gso_size;

	if (mss) {

		if (skb->protocol == htons(ETH_P_IP)) {

			proto_hdr_len = ((skb->h.raw - skb->data) +

			proto_hdr_len = (skb_transport_offset(skb) +

					 (skb->h.th->doff << 2));

			if (unlikely(proto_hdr_len > len)) {

				dev_kfree_skb_any(skb);

drivers/net/cassini.c

+2 −4
Original line number Diff line number Diff line
@@ -2821,10 +2821,8 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring, 


	ctrl = 0;

	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		u64 csum_start_off, csum_stuff_off;



		csum_start_off = (u64) (skb->h.raw - skb->data);

		csum_stuff_off = csum_start_off + skb->csum_offset;

		const u64 csum_start_off = skb_transport_offset(skb);

		const u64 csum_stuff_off = csum_start_off + skb->csum_offset;



		ctrl =  TX_DESC_CSUM_EN |

			CAS_BASE(TX_DESC_CSUM_START, csum_start_off) |

drivers/net/cxgb3/sge.c

+4 −3
Original line number Diff line number Diff line
@@ -1319,9 +1319,10 @@ static void write_ofld_wr(struct adapter *adap, struct sk_buff *skb, 
	/* Only TX_DATA builds SGLs */



	from = (struct work_request_hdr *)skb->data;

	memcpy(&d->flit[1], &from[1], skb->h.raw - skb->data - sizeof(*from));

	memcpy(&d->flit[1], &from[1],

	       skb_transport_offset(skb) - sizeof(*from));



	flits = (skb->h.raw - skb->data) / 8;

	flits = skb_transport_offset(skb) / 8;

	sgp = ndesc == 1 ? (struct sg_ent *)&d->flit[flits] : sgl;

	sgl_flits = make_sgl(skb, sgp, skb->h.raw, skb->tail - skb->h.raw,

			     adap->pdev);
@@ -1349,7 +1350,7 @@ static inline unsigned int calc_tx_descs_ofld(const struct sk_buff *skb) 
	if (skb->len <= WR_LEN && cnt == 0)

		return 1;	/* packet fits as immediate data */



	flits = (skb->h.raw - skb->data) / 8;	/* headers */

	flits = skb_transport_offset(skb) / 8;	/* headers */

	if (skb->tail != skb->h.raw)

		cnt++;

	return flits_to_desc(flits + sgl_len(cnt));

drivers/net/e1000/e1000_main.c

+5 −5
Original line number Diff line number Diff line
@@ -2887,7 +2887,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
				return err;

		}



		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));

		hdr_len = (skb_transport_offset(skb) + (skb->h.th->doff << 2));

		mss = skb_shinfo(skb)->gso_size;

		if (skb->protocol == htons(ETH_P_IP)) {

			struct iphdr *iph = ip_hdr(skb);
@@ -2897,7 +2897,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
							      iph->daddr, 0,

							      IPPROTO_TCP, 0);

			cmd_length = E1000_TXD_CMD_IP;

			ipcse = skb->h.raw - skb->data - 1;

			ipcse = skb_transport_offset(skb) - 1;

		} else if (skb->protocol == htons(ETH_P_IPV6)) {

			ipv6_hdr(skb)->payload_len = 0;

			skb->h.th->check =
@@ -2908,7 +2908,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
		}

		ipcss = skb_network_offset(skb);

		ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;

		tucss = skb->h.raw - skb->data;

		tucss = skb_transport_offset(skb);

		tucso = (void *)&(skb->h.th->check) - (void *)skb->data;

		tucse = 0;
@@ -2950,7 +2950,7 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring, 
	uint8_t css;



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

		css = skb->h.raw - skb->data;

		css = skb_transport_offset(skb);



		i = tx_ring->next_to_use;

		buffer_info = &tx_ring->buffer_info[i];
@@ -3292,7 +3292,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
		/* TSO Workaround for 82571/2/3 Controllers -- if skb->data

		* points to just header, pull a few bytes of payload from

		* frags into skb->data */

		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));

		hdr_len = (skb_transport_offset(skb) + (skb->h.th->doff << 2));

		if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) {

			switch (adapter->hw.mac_type) {

				unsigned int pull_size;

drivers/net/ixgb/ixgb_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) 
				return err;

		}



		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));

		hdr_len = (skb_transport_offset(skb) + (skb->h.th->doff << 2));

		mss = skb_shinfo(skb)->gso_size;

		iph = ip_hdr(skb);

		iph->tot_len = 0;
@@ -1199,8 +1199,8 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) 
						      0, IPPROTO_TCP, 0);

		ipcss = skb_network_offset(skb);

		ipcso = (void *)&(iph->check) - (void *)skb->data;

		ipcse = skb->h.raw - skb->data - 1;

		tucss = skb->h.raw - skb->data;

		ipcse = skb_transport_offset(skb) - 1;

		tucss = skb_transport_offset(skb);

		tucso = (void *)&(skb->h.th->check) - (void *)skb->data;

		tucse = 0;
@@ -1245,7 +1245,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb) 


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

		struct ixgb_buffer *buffer_info;

		css = skb->h.raw - skb->data;

		css = skb_transport_offset(skb);

		cso = css + skb->csum_offset;



		i = adapter->tx_ring.next_to_use;