From 820e82e953ad185201596a15b069ae3444797533 Mon Sep 17 00:00:00 2001 From: Franky Lin Date: Wed, 11 Apr 2012 11:52:46 +0200 Subject: [PATCH] --- yaml --- r: 300956 b: refs/heads/master c: 8f1ab44d8de5154cf6746d07f0902ea73f059c2b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0d31305998e4..e153dd7dc952 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 474a64c80e2979bbc290a7eccf76e5694cbd5fee +refs/heads/master: 8f1ab44d8de5154cf6746d07f0902ea73f059c2b diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c index b3e3b7f25d82..a5c15cac5e7d 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c @@ -421,6 +421,7 @@ int brcmf_proto_hdrpull(struct device *dev, int *ifidx, pktbuf->priority = h->priority & BDC_PRIORITY_MASK; skb_pull(pktbuf, BDC_HEADER_LEN); + skb_pull(pktbuf, h->data_offset << 2); return 0; }