diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-08 13:44:29 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-08 13:44:29 -0500 |
| commit | 300e5fd160114920079dd3ec132e5c01d00e4a1d (patch) | |
| tree | 6032c96747aeae7544be71e4f3b7e2866a21bb1c /include/uapi | |
| parent | 6e08d757b72f280c45cfec61e63216adb419e2dd (diff) | |
| parent | e825eb1d7e06f616003c17e2e8e421c2e5e44142 (diff) | |
| download | op-kernel-dev-300e5fd160114920079dd3ec132e5c01d00e4a1d.zip op-kernel-dev-300e5fd160114920079dd3ec132e5c01d00e4a1d.tar.gz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/if_arp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h index d7fea34..4d024d7 100644 --- a/include/uapi/linux/if_arp.h +++ b/include/uapi/linux/if_arp.h @@ -94,6 +94,7 @@ #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 */ |
