diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:33:43 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:33:43 -0500 |
commit | 71e834f563799e09c6bd7d6638993b464fac26f5 (patch) | |
tree | 3a35643ddc54e7217ec000eb415cc79a65cdcac1 /include/linux/if_ether.h | |
parent | ff0fc1467f8189c8e2340b91161c97138a75e484 (diff) | |
parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) |
Merge branch 'master'
Diffstat (limited to 'include/linux/if_ether.h')
-rw-r--r-- | include/linux/if_ether.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index fe26d431de87..7a92c1ce1457 100644 --- 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. |