diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-12 20:56:31 -0300 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:25:12 -0700 |
commit | d0a92be05ed4aea7d35c2b257e3f9173565fe4eb (patch) | |
tree | de57331758805956bcb54dda798e3ca76dd5a46f /include | |
parent | fd74e6ccd522e2f26163eb5ac1abebcab2bd017c (diff) |
[SK_BUFF]: Introduce arp_hdr(), remove skb->nh.arph
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/if_arp.h | 9 | ||||
-rw-r--r-- | include/linux/skbuff.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 7f5714214ee..ed7b93c3083 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -148,4 +148,13 @@ struct arphdr }; +#ifdef __KERNEL__ +#include <linux/skbuff.h> + +static inline struct arphdr *arp_hdr(const struct sk_buff *skb) +{ + return (struct arphdr *)skb_network_header(skb); +} +#endif + #endif /* _LINUX_IF_ARP_H */ diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 62f841b5b70..9cb674b12b2 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -248,7 +248,6 @@ struct sk_buff { union { struct ipv6hdr *ipv6h; - struct arphdr *arph; unsigned char *raw; } nh; |