Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / linux / compat / include / linux / if_ether.h

diff --git a/datapath/linux/compat/include/linux/if_ether.h b/datapath/linux/compat/include/linux/if_ether.h
index 41cc053..25f63ca 100644 (file)
--- a/datapath/linux/compat/include/linux/if_ether.h
+++ b/datapath/linux/compat/include/linux/if_ether.h
@@ -3,17 +3,12 @@
 
 #include_next <linux/if_ether.h>
 
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-
-#define ETH_P_TEB      0x6558          /* Trans Ether Bridging         */
-
-#endif /* linux kernel < 2.6.28 */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-
-#define ETH_P_FCOE     0x8906          /* Fibre Channel over Ethernet  */
+#ifndef ETH_P_802_3_MIN
+#define ETH_P_802_3_MIN        0x0600
+#endif
 
-#endif /* linux kernel < 2.6.30 */
+#ifndef ETH_P_8021AD
+#define ETH_P_8021AD    0x88A8          /* 802.1ad Service VLAN         */
+#endif
 
 #endif