diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-11 00:06:25 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:28 -0400 |
commit | 39b89160df691045d1449cbaef43c02084c7543a (patch) | |
tree | bbe217599a1b84f3bf33c053e2c7d3bdf8bdd571 /include | |
parent | b0061ce49c83657563b64ffcf1ec137110230d93 (diff) |
[SK_BUFF]: Introduce ipipv6_hdr(), remove skb->h.ipv6h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ipv6.h | 5 | ||||
-rw-r--r-- | include/linux/skbuff.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index ec79c59b2077..b768fcc0a4c4 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -228,6 +228,11 @@ static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb) | |||
228 | return (struct ipv6hdr *)skb_network_header(skb); | 228 | return (struct ipv6hdr *)skb_network_header(skb); |
229 | } | 229 | } |
230 | 230 | ||
231 | static inline struct ipv6hdr *ipipv6_hdr(const struct sk_buff *skb) | ||
232 | { | ||
233 | return (struct ipv6hdr *)skb->h.raw; | ||
234 | } | ||
235 | |||
231 | /* | 236 | /* |
232 | This structure contains results of exthdrs parsing | 237 | This structure contains results of exthdrs parsing |
233 | as offsets from skb->nh. | 238 | as offsets from skb->nh. |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 862a81cf7f74..d3f186230ee2 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -237,7 +237,6 @@ struct sk_buff { | |||
237 | /* 4 byte hole on 64 bit*/ | 237 | /* 4 byte hole on 64 bit*/ |
238 | 238 | ||
239 | union { | 239 | union { |
240 | struct ipv6hdr *ipv6h; | ||
241 | unsigned char *raw; | 240 | unsigned char *raw; |
242 | } h; | 241 | } h; |
243 | 242 | ||