diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
| commit | 2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc (patch) | |
| tree | 9478e8cf470c1d5bdb2d89b57a7e35919ab95e72 /include/uapi/linux/if_ether.h | |
| parent | 08f8aeb55d7727d644dbbbbfb798fe937d47751d (diff) | |
| parent | 2b4cfe64dee0d84506b951d81bf55d9891744d25 (diff) | |
Merge branch 'sched/urgent' into sched/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/if_ether.h')
| -rw-r--r-- | include/uapi/linux/if_ether.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index 2ce0f6a78fa5..0f8210b8e0bc 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 |
| @@ -89,6 +89,8 @@ | |||
| 89 | #define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ | 89 | #define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ |
| 90 | #define ETH_P_TDLS 0x890D /* TDLS */ | 90 | #define ETH_P_TDLS 0x890D /* TDLS */ |
| 91 | #define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ | 91 | #define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ |
| 92 | #define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */ | ||
| 93 | #define ETH_P_LOOPBACK 0x9000 /* Ethernet loopback packet, per IEEE 802.3 */ | ||
| 92 | #define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ | 94 | #define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 93 | #define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ | 95 | #define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ |
| 94 | #define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ | 96 | #define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ |