Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / include / linux / if_ether.h

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 60e8934d10b5e070ab2289a19c787935026722b1..ae3a1871413dd031b41edcd9e4159f92a1363081 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -107,6 +107,7 @@
 #define ETH_P_DSA      0x001B          /* Distributed Switch Arch.     */
 #define ETH_P_TRAILER  0x001C          /* Trailer switch tagging       */
 #define ETH_P_PHONET   0x00F5          /* Nokia Phonet frames          */
+#define ETH_P_IEEE802154 0x00F6                /* IEEE802.15.4 frame           */
 
 /*
  *     This is an Ethernet frame header.