Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

[linux-2.6-microblaze.git] / include / linux / if_ether.h

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index fe26d43..7a92c1c 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -72,6 +72,7 @@
                                         * over Ethernet
                                         */
 #define ETH_P_AOE      0x88A2          /* ATA over Ethernet            */
+#define ETH_P_TIPC     0x88CA          /* TIPC                         */
 
 /*
  *     Non DIX types. Won't clash for 1500 types.