X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fif_arp.h;h=296e8e86e91d1c33052ea2b27ad3b1d8f86895db;hb=11d64be6a631236b3b3d21711c7d1a83d9f85904;hp=7f5714214ee35e787aa77dfbd3b8cf63d21ca620;hpb=e993835441734c184d70d3716eed78a08eeb71c2;p=linux-2.6

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 7f5714214e..296e8e86e9 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -52,6 +52,7 @@
 #define ARPHRD_ROSE	270
 #define ARPHRD_X25	271		/* CCITT X.25			*/
 #define ARPHRD_HWX25	272		/* Boards with X.25 in firmware	*/
+#define ARPHRD_CAN	280		/* Controller Area Network      */
 #define ARPHRD_PPP	512
 #define ARPHRD_CISCO	513		/* Cisco HDLC	 		*/
 #define ARPHRD_HDLC	ARPHRD_CISCO
@@ -148,4 +149,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 */