diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 18:02:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:25:27 -0700 |
| commit | b0061ce49c83657563b64ffcf1ec137110230d93 (patch) | |
| tree | be6788071fdbc53261ee395f596705e1418461d1 /include/linux | |
| parent | aa8223c7bb0b05183e1737881ed21827aa5b9e73 (diff) | |
[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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ip.h | 5 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index f2f26db16f5..19578440b5f 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h @@ -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 { diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 8f158d66d2a..862a81cf7f7 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -237,7 +237,6 @@ struct sk_buff { /* 4 byte hole on 64 bit*/ union { - struct iphdr *ipiph; struct ipv6hdr *ipv6h; unsigned char *raw; } h; |