summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-05 19:06:45 -0700
committerDavid S. Miller <davem@davemloft.net>2009-07-05 19:06:45 -0700
commit6b1344724e10c166d9e3c17011ed879ddf302e94 (patch)
treebbfa98b183c1249a58ad2debdb696392d8c4a029 /include
parent8e4a718ff38d8539938ec3421935904c27e00c39 (diff)
parent1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (diff)
downloadlinux-6b1344724e10c166d9e3c17011ed879ddf302e94.tar.gz
linux-6b1344724e10c166d9e3c17011ed879ddf302e94.tar.bz2
linux-6b1344724e10c166d9e3c17011ed879ddf302e94.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_ether.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index ae3a1871413d..70fdba2bbf71 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -78,6 +78,7 @@
#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
#define ETH_P_TIPC 0x88CA /* TIPC */
+#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */
#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */