From: Arend van Spriel Date: Wed, 29 Jun 2011 23:47:40 +0000 (-0700) Subject: staging: brcm80211: use linux native ethertype iso ETH_P_BRCM X-Git-Tag: MMI-PSA29.97-13-9~18845^2~275 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb645abd454fea5a625fd0921b19356680cb7241;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: brcm80211: use linux native ethertype iso ETH_P_BRCM The linux native ethertype ETH_P_LINK_CTL is matching ETH_P_BRCM so lets use that definition and get rid of ETH_P_BRCM. Signed-off-by: Arend van Spriel Reviewed-by: Roland Vossen Reviewed-by: Franky Lin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 19e09bd82643..c3cbda6cc078 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -43,8 +43,6 @@ #include "dhd_dbg.h" #include "wl_cfg80211.h" -#define ETH_P_BRCM 0x886c - /* Global ASSERT type flag */ u32 g_assert_type; @@ -947,7 +945,7 @@ void brcmf_rx_frame(dhd_pub_t *dhdp, int ifidx, struct sk_buff *skb, skb_pull(skb, ETH_HLEN); /* Process special event packets and then discard them */ - if (ntohs(skb->protocol) == ETH_P_BRCM) + if (ntohs(skb->protocol) == ETH_P_LINK_CTL) brcmf_host_event(dhd, &ifidx, skb_mac_header(skb), &event, &data);