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

[SK_BUFF]: Introduce ipip_hdr(), remove skb->h.ipiph 



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

drivers/net/sk98lin/skge.c

+2 −2
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ struct sk_buff *pMessage) /* pointer to send-message */ 
		u16 hdrlen = skb_transport_offset(pMessage);

		u16 offset = hdrlen + pMessage->csum_offset;



		if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) &&

		if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&

			(pAC->GIni.GIChipRev == 0) &&

			(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {

			pTxd->TBControl = BMU_TCP_CHECK;
@@ -1691,7 +1691,7 @@ struct sk_buff *pMessage) /* pointer to send-message */ 
		** opcode for udp is not working in the hardware yet 

		** (Revision 2.0)

		*/

		if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) &&

		if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&

			(pAC->GIni.GIChipRev == 0) &&

			(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {

			Control |= BMU_TCP_CHECK;

drivers/net/skge.c

+1 −1
Original line number Diff line number Diff line
@@ -2659,7 +2659,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) 
		/* This seems backwards, but it is what the sk98lin

		 * does.  Looks like hardware is wrong?

		 */

		if (skb->h.ipiph->protocol == IPPROTO_UDP

		if (ipip_hdr(skb)->protocol == IPPROTO_UDP

	            && hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON)

			control = BMU_TCP_CHECK;

		else

include/linux/ip.h

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ static inline struct iphdr *ip_hdr(const struct sk_buff *skb) 
{

	return (struct iphdr *)skb_network_header(skb);

}



static inline struct iphdr *ipip_hdr(const struct sk_buff *skb)

{

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

}

#endif



struct ip_auth_hdr {

include/linux/skbuff.h

+0 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ struct sk_buff { 
	/* 4 byte hole on 64 bit*/



	union {

		struct iphdr	*ipiph;

		struct ipv6hdr	*ipv6h;

		unsigned char	*raw;

	} h;

net/ipv4/xfrm4_mode_beet.c

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) 


		if (!pskb_may_pull(skb, sizeof(*ph)))

			goto out;

		ph = (struct ip_beet_phdr *)(skb->h.ipiph + 1);

		ph = (struct ip_beet_phdr *)(ipip_hdr(skb) + 1);



		phlen = sizeof(*ph) + ph->padlen;

		optlen = ph->hdrlen * 8 + (IPV4_BEET_PHMAXLEN - phlen);
@@ -97,9 +97,9 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) 
		ph_nexthdr = ph->nexthdr;

	}



	skb->nh.raw = skb->data + (phlen - sizeof(*iph));

	skb_set_network_header(skb, phlen - sizeof(*iph));

	memmove(skb_network_header(skb), iph, sizeof(*iph));

	skb->h.raw = skb->data + (phlen + optlen);

	skb_set_transport_header(skb, phlen + optlen);

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



	iph = ip_hdr(skb);