commit e084501669a4e4931c9d648351ecd7d595b81b79
author Christopher Ferris <cferris@google.com> Wed Jul 09 14:58:51 2014 -0700
committer Christopher Ferris <cferris@google.com> Thu Jul 10 10:05:53 2014 -0700
tree b05c810ed2141776003404f1c4c748f45a36c3ea
parent ce0f6dc18a90dc42ddd174a0a1baba9a3612d595

Update to v3.14 kernel headers.

Change-Id: I4353cbc4ac56c173f6ddca0ea9361825fa53f04a

original/uapi/linux/if_arp.h

diff --git a/original/uapi/linux/if_arp.h b/original/uapi/linux/if_arp.h
index 82c7d1b..4d024d7 100644
--- a/original/uapi/linux/if_arp.h
+++ b/original/uapi/linux/if_arp.h
@@ -93,6 +93,8 @@
 #define ARPHRD_PHONET_PIPE 821		/* PhoNet pipe header		*/
 #define ARPHRD_CAIF	822		/* CAIF media type		*/
 #define ARPHRD_IP6GRE	823		/* GRE over IPv6		*/
+#define ARPHRD_NETLINK	824		/* Netlink header		*/
+#define ARPHRD_6LOWPAN	825		/* IPv6 over LoWPAN             */
 
 #define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known */
 #define ARPHRD_NONE	  0xFFFE	/* zero header length */