diff --git a/[refs] b/[refs] index c3734d11be3d..f97036740656 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d659a3ec838866482779f594c4520f553468c492 +refs/heads/master: d7ec915abc98795a4cb88e369e2918696dd0ea01 diff --git a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h index 888165e1ab5c..ad55b565c847 100644 --- a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h +++ b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h @@ -28,13 +28,8 @@ #define ETHER_MAX_LEN 1518 #define ETHER_MAX_DATA 1500 -#define ETHER_TYPE_MIN 0x0600 -#define ETHER_TYPE_IP 0x0800 -#define ETHER_TYPE_ARP 0x0806 -#define ETHER_TYPE_8021Q 0x8100 #define ETHER_TYPE_BRCM 0x886c #define ETHER_TYPE_802_1X 0x888e -#define ETHER_TYPE_802_1X_PREAUTH 0x88c7 #define ETHER_DEST_OFFSET (0 * ETH_ALEN) #define ETHER_SRC_OFFSET (1 * ETH_ALEN)