Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259808
b: refs/heads/master
c: cb645ab
h: refs/heads/master
v: v3
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent 0c50e19 commit 4168b7c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c8796cbeabba6dd946b78edea71dbee90edabbf0
refs/heads/master: cb645abd454fea5a625fd0921b19356680cb7241
4 changes: 1 addition & 3 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4168b7c

Please sign in to comment.