diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-06-04 22:14:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-04 22:14:53 -0400 |
| commit | 4ef36e156670c2d835ccb4000a561ece4e598fd9 (patch) | |
| tree | 15413622e1850f3d0c26c040e2d7001e192cd474 /drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | |
| parent | Merge branch 'mediatek-fixes' (diff) | |
| parent | MAINTAINERS: Add file patterns for wireless device tree bindings (diff) | |
| download | linux-dev-4ef36e156670c2d835ccb4000a561ece4e598fd9.tar.xz linux-dev-4ef36e156670c2d835ccb4000a561ece4e598fd9.zip | |
Merge tag 'wireless-drivers-for-davem-2016-06-04' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for 4.7
brcmfmac
* add fallback RSSI report for devices that do not report per-chain values
* fix a null pointer derefence regression on PCIe full dongle devices
rtlwifi
* fix scheduling while atomic regression from commit 49f86ec21c01
MAINTAINERS
* add file patterns for wireless device tree bindings
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c index 68f1ce02f4bf..2b9a2bc429d6 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c @@ -1157,6 +1157,8 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf) brcmu_pkt_buf_free_skb(skb); return; } + + skb->protocol = eth_type_trans(skb, ifp->ndev); brcmf_netif_rx(ifp, skb); } |