summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-12 20:56:31 -0300
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:25:12 -0700
commitd0a92be05ed4aea7d35c2b257e3f9173565fe4eb (patch)
treede57331758805956bcb54dda798e3ca76dd5a46f /include/linux
parentfd74e6ccd522e2f26163eb5ac1abebcab2bd017c (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/linux')
-rw-r--r--include/linux/if_arp.h9
-rw-r--r--include/linux/skbuff.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 7f5714214ee3..ed7b93c3083a 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 62f841b5b700..9cb674b12b29 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;