[NET]: Add ETH_P_MPLS_* and ARPHRD_INFINIBAND defines from 2.6.x
Linux Kernel Mailing List <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.2-4 |
|---|---|
| Message-ID | <[email protected]> |
ChangeSet 1.1555, 2005/01/06 15:06:23-08:00, [email protected] [NET]: Add ETH_P_MPLS_* and ARPHRD_INFINIBAND defines from 2.6.x Signed-off-by: David S. Miller <[email protected]> if_arp.h | 1 + if_ether.h | 2 ++ 2 files changed, 3 insertions(+) diff -Nru a/include/linux/if_arp.h b/include/linux/if_arp.h --- a/include/linux/if_arp.h 2005-01-15 07:06:15 -08:00 +++ b/include/linux/if_arp.h 2005-01-15 07:06:15 -08:00 @@ -40,6 +40,7 @@ #define ARPHRD_METRICOM 23 /* Metricom STRIP (new IANA id) */ #define ARPHRD_IEEE1394 24 /* IEEE 1394 IPv4 - RFC 2734 */ #define ARPHRD_EUI64 27 /* EUI-64 */ +#define ARPHRD_INFINIBAND 32 /* InfiniBand */ /* Dummy types for non ARP hardware */ #define ARPHRD_SLIP 256 diff -Nru a/include/linux/if_ether.h b/include/linux/if_ether.h --- a/include/linux/if_ether.h 2005-01-15 07:06:15 -08:00 +++ b/include/linux/if_ether.h 2005-01-15 07:06:15 -08:00 @@ -61,6 +61,8 @@ #define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ #define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ #define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ +#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ +#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ #define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ #define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport * over Ethernet