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

[SK_BUFF]: Introduce skb_transport_header(skb) 



For the places where we need a pointer to the transport header, it is
still legal to touch skb->h.raw directly if just adding to,
subtracting from or setting it to another layer header.

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

drivers/net/appletalk/ltpc.c

+5 −2
Original line number Diff line number Diff line
@@ -917,6 +917,7 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) 


	int i;

	struct lt_sendlap cbuf;

	unsigned char *hdr;



	cbuf.command = LT_SENDLAP;

	cbuf.dnode = skb->data[0];
@@ -932,11 +933,13 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) 
		printk("\n");

	}



	do_write(dev,&cbuf,sizeof(cbuf),skb->h.raw,skb->len);

	hdr = skb_transport_header(skb);

	do_write(dev, &cbuf, sizeof(cbuf), hdr, skb->len);



	if(debug & DEBUG_UPPER) {

		printk("sent %d ddp bytes\n",skb->len);

		for(i=0;i<skb->len;i++) printk("%02x ",skb->h.raw[i]);

		for (i = 0; i < skb->len; i++)

			printk("%02x ", hdr[i]);

		printk("\n");

	}

drivers/net/cxgb3/sge.c

+5 −3
Original line number Diff line number Diff line
@@ -1324,12 +1324,14 @@ static void write_ofld_wr(struct adapter *adap, struct sk_buff *skb, 


	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,

	sgl_flits = make_sgl(skb, sgp, skb_transport_header(skb),

			     skb->tail - skb_transport_header(skb),

			     adap->pdev);

	if (need_skb_unmap()) {

		setup_deferred_unmapping(skb, adap->pdev, sgp, sgl_flits);

		skb->destructor = deferred_unmap_destructor;

		((struct unmap_info *)skb->cb)->len = skb->tail - skb->h.raw;

		((struct unmap_info *)skb->cb)->len = (skb->tail -

						       skb_transport_header(skb));

	}



	write_wr_hdr_sgl(ndesc, skb, d, pidx, q, sgl, flits, sgl_flits,
@@ -1351,7 +1353,7 @@ static inline unsigned int calc_tx_descs_ofld(const struct sk_buff *skb) 
		return 1;	/* packet fits as immediate data */



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

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

	if (skb->tail != skb_transport_header(skb))

		cnt++;

	return flits_to_desc(flits + sgl_len(cnt));

}

drivers/s390/net/qeth_eddp.c

+2 −2
Original line number Diff line number Diff line
@@ -476,13 +476,13 @@ qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, 
		eddp = qeth_eddp_create_eddp_data(qhdr,

						  skb_network_header(skb),

						  ip_hdrlen(skb),

						  skb->h.raw,

						  skb_transport_header(skb),

						  tcp_hdrlen(skb));

	else

		eddp = qeth_eddp_create_eddp_data(qhdr,

						  skb_network_header(skb),

						  sizeof(struct ipv6hdr),

						  skb->h.raw,

						  skb_transport_header(skb),

						  tcp_hdrlen(skb));



	if (eddp == NULL) {

include/linux/atalk.h

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct ddpehdr { 


static __inline__ struct ddpehdr *ddp_hdr(struct sk_buff *skb)

{

	return (struct ddpehdr *)skb->h.raw;

	return (struct ddpehdr *)skb_transport_header(skb);

}



/* AppleTalk AARP headers */
@@ -129,7 +129,7 @@ struct elapaarp { 


static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb)

{

	return (struct elapaarp *)skb->h.raw;

	return (struct elapaarp *)skb_transport_header(skb);

}



/* Not specified - how long till we drop a resolved entry */

include/linux/dccp.h

+12 −7
Original line number Diff line number Diff line
@@ -260,19 +260,20 @@ enum { 


static inline struct dccp_hdr *dccp_hdr(const struct sk_buff *skb)

{

	return (struct dccp_hdr *)skb->h.raw;

	return (struct dccp_hdr *)skb_transport_header(skb);

}



static inline struct dccp_hdr *dccp_zeroed_hdr(struct sk_buff *skb, int headlen)

{

	skb_push(skb, headlen);

	skb_reset_transport_header(skb);

	return memset(skb->h.raw, 0, headlen);

	return memset(skb_transport_header(skb), 0, headlen);

}



static inline struct dccp_hdr_ext *dccp_hdrx(const struct sk_buff *skb)

{

	return (struct dccp_hdr_ext *)(skb->h.raw + sizeof(struct dccp_hdr));

	return (struct dccp_hdr_ext *)(skb_transport_header(skb) +

				       sizeof(struct dccp_hdr));

}



static inline unsigned int __dccp_basic_hdr_len(const struct dccp_hdr *dh)
@@ -301,12 +302,14 @@ static inline __u64 dccp_hdr_seq(const struct sk_buff *skb) 


static inline struct dccp_hdr_request *dccp_hdr_request(struct sk_buff *skb)

{

	return (struct dccp_hdr_request *)(skb->h.raw + dccp_basic_hdr_len(skb));

	return (struct dccp_hdr_request *)(skb_transport_header(skb) +

					   dccp_basic_hdr_len(skb));

}



static inline struct dccp_hdr_ack_bits *dccp_hdr_ack_bits(const struct sk_buff *skb)

{

	return (struct dccp_hdr_ack_bits *)(skb->h.raw + dccp_basic_hdr_len(skb));

	return (struct dccp_hdr_ack_bits *)(skb_transport_header(skb) +

					    dccp_basic_hdr_len(skb));

}



static inline u64 dccp_hdr_ack_seq(const struct sk_buff *skb)
@@ -317,12 +320,14 @@ static inline u64 dccp_hdr_ack_seq(const struct sk_buff *skb) 


static inline struct dccp_hdr_response *dccp_hdr_response(struct sk_buff *skb)

{

	return (struct dccp_hdr_response *)(skb->h.raw + dccp_basic_hdr_len(skb));

	return (struct dccp_hdr_response *)(skb_transport_header(skb) +

					    dccp_basic_hdr_len(skb));

}



static inline struct dccp_hdr_reset *dccp_hdr_reset(struct sk_buff *skb)

{

	return (struct dccp_hdr_reset *)(skb->h.raw + dccp_basic_hdr_len(skb));

	return (struct dccp_hdr_reset *)(skb_transport_header(skb) +

					 dccp_basic_hdr_len(skb));

}



static inline unsigned int __dccp_hdr_len(const struct dccp_hdr *dh)

CRA Git | Maintained and supported by SUSTech CRA and CCSE