openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2007-04-25 18:02:22 -07:00 committed by David S. Miller
parent aa8223c7bb
commit b0061ce49c
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/sk98lin/skge.c
View File

@ -1565,7 +1565,7 @@ struct sk_buff *pMessage) /* pointer to send-message */
u16 hdrlen = skb_transport_offset(pMessage); u16 hdrlen = skb_transport_offset(pMessage);
u16 offset = hdrlen + pMessage->csum_offset; 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.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) { (pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
pTxd->TBControl = BMU_TCP_CHECK; 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 ** opcode for udp is not working in the hardware yet
** (Revision 2.0) ** (Revision 2.0)
*/ */
if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) && if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&
(pAC->GIni.GIChipRev == 0) && (pAC->GIni.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) { (pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
Control |= BMU_TCP_CHECK; Control |= BMU_TCP_CHECK;

2
drivers/net/skge.c
View File

@ -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 /* This seems backwards, but it is what the sk98lin
* does. Looks like hardware is wrong? * 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) && hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON)
control = BMU_TCP_CHECK; control = BMU_TCP_CHECK;
else else

5
include/linux/ip.h
View File

@ -111,6 +111,11 @@ static inline struct iphdr *ip_hdr(const struct sk_buff *skb)
{ {
return (struct iphdr *)skb_network_header(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 #endif
struct ip_auth_hdr { struct ip_auth_hdr {

1
include/linux/skbuff.h
View File

@ -237,7 +237,6 @@ struct sk_buff {
/* 4 byte hole on 64 bit*/ /* 4 byte hole on 64 bit*/
union { union {
struct iphdr *ipiph;
struct ipv6hdr *ipv6h; struct ipv6hdr *ipv6h;
unsigned char *raw; unsigned char *raw;
} h; } h;

6
net/ipv4/xfrm4_mode_beet.c
View File

@ -83,7 +83,7 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)
if (!pskb_may_pull(skb, sizeof(*ph))) if (!pskb_may_pull(skb, sizeof(*ph)))
goto out; 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; phlen = sizeof(*ph) + ph->padlen;
optlen = ph->hdrlen * 8 + (IPV4_BEET_PHMAXLEN - phlen); 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; 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)); 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; skb->data = skb->h.raw;
iph = ip_hdr(skb); iph = ip_hdr(skb);

6
net/ipv4/xfrm4_mode_tunnel.c
View File

@ -17,7 +17,7 @@
static inline void ipip_ecn_decapsulate(struct sk_buff *skb) static inline void ipip_ecn_decapsulate(struct sk_buff *skb)
{ {
struct iphdr *outer_iph = ip_hdr(skb); struct iphdr *outer_iph = ip_hdr(skb);
struct iphdr *inner_iph = skb->h.ipiph; struct iphdr *inner_iph = ipip_hdr(skb);
if (INET_ECN_is_ce(outer_iph->tos)) if (INET_ECN_is_ce(outer_iph->tos))
IP_ECN_set_ce(inner_iph); IP_ECN_set_ce(inner_iph);
@ -47,7 +47,7 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
int flags; int flags;
iph = ip_hdr(skb); iph = ip_hdr(skb);
skb->h.ipiph = iph; skb->h.raw = skb->nh.raw;
skb_push(skb, x->props.header_len); skb_push(skb, x->props.header_len);
skb_reset_network_header(skb); skb_reset_network_header(skb);
@ -116,7 +116,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
iph = ip_hdr(skb); iph = ip_hdr(skb);
if (iph->protocol == IPPROTO_IPIP) { if (iph->protocol == IPPROTO_IPIP) {
if (x->props.flags & XFRM_STATE_DECAP_DSCP) if (x->props.flags & XFRM_STATE_DECAP_DSCP)
ipv4_copy_dscp(iph, skb->h.ipiph); ipv4_copy_dscp(iph, ipip_hdr(skb));
if (!(x->props.flags & XFRM_STATE_NOECN)) if (!(x->props.flags & XFRM_STATE_NOECN))
ipip_ecn_decapsulate(skb); ipip_ecn_decapsulate(skb);
} }

2
net/ipv6/xfrm6_mode_tunnel.c
View File

@ -28,7 +28,7 @@ static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
static inline void ip6ip_ecn_decapsulate(struct sk_buff *skb) static inline void ip6ip_ecn_decapsulate(struct sk_buff *skb)
{ {
if (INET_ECN_is_ce(ipv6_get_dsfield(ipv6_hdr(skb)))) if (INET_ECN_is_ce(ipv6_get_dsfield(ipv6_hdr(skb))))
IP_ECN_set_ce(skb->h.ipiph); IP_ECN_set_ce(ipip_hdr(skb));
} }
/* Add encapsulation header. /* Add encapsulation header.