diff options
author | Neil Jerram <Neil.Jerram@metaswitch.com> | 2014-02-25 06:17:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-26 15:14:26 -0500 |
commit | 2ebe21fdde1c92ef1654f23d29194145be0e1ddc (patch) | |
tree | 32cc19811e79c5e8b9a38a57cbfc3d446fbf0278 | |
parent | cd2b0389dc304c6a7fa2ebae200f246059c68dd9 (diff) |
net: order MPLS ethertypes numerically
All ethertypes other than ETH_P_MPLS_UC, ETH_P_MPLS_MC and
ETH_P_ATMMPOA were already ordered numerically. This commit moves
those three ETH_P_... values into correct numerical order too.
Signed-off-by: Neil Jerram <Neil.Jerram@metaswitch.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/uapi/linux/if_ether.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index 2ce0f6a78fa5..ba8b15f07940 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h | |||
@@ -68,11 +68,11 @@ | |||
68 | #define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ | 68 | #define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ |
69 | #define ETH_P_WCCP 0x883E /* Web-cache coordination protocol | 69 | #define ETH_P_WCCP 0x883E /* Web-cache coordination protocol |
70 | * defined in draft-wilson-wrec-wccp-v2-00.txt */ | 70 | * defined in draft-wilson-wrec-wccp-v2-00.txt */ |
71 | #define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ | ||
72 | #define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ | ||
73 | #define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ | 71 | #define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ |
74 | #define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ | 72 | #define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ |
75 | #define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ | 73 | #define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ |
74 | #define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ | ||
75 | #define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ | ||
76 | #define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ | 76 | #define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ |
77 | #define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport | 77 | #define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport |
78 | * over Ethernet | 78 | * over Ethernet |