diff --git a/[refs] b/[refs] index 8775f7b1b82e..e41c31b34397 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d91c2d00a0fc10448f49b52b344e5619b99765a +refs/heads/master: 63afe12f4be3b08597ae41ce7c0837bfc106b0ac diff --git a/trunk/include/linux/if_ether.h b/trunk/include/linux/if_ether.h index e473003e4bda..56d907a2c804 100644 --- a/trunk/include/linux/if_ether.h +++ b/trunk/include/linux/if_ether.h @@ -79,6 +79,7 @@ #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ #define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */ +#define ETH_P_802_EX1 0x88B5 /* 802.1 Local Experimental 1. */ #define ETH_P_TIPC 0x88CA /* TIPC */ #define ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */ #define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */