diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-03 15:25:15 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-03 15:25:15 -0500 |
| commit | 55d1cad2efe2e3567c3116f50ba10e5af1bc01fc (patch) | |
| tree | 5d09fc11643739c5266250383cffbe577a562ee5 /drivers/net/wireless/brcm80211 | |
| parent | 39731b78b4afebb7501c05b68e2443a1b250b41c (diff) | |
| parent | 32db6b54dfba38aa8fa4072b2a3fc6425139166a (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 7918c1033662..c3e7d76dbf35 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | |||
| @@ -1873,7 +1873,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) | |||
| 1873 | brcmf_dbg(DATA, "tx proto=0x%X\n", ntohs(eh->h_proto)); | 1873 | brcmf_dbg(DATA, "tx proto=0x%X\n", ntohs(eh->h_proto)); |
| 1874 | /* determine the priority */ | 1874 | /* determine the priority */ |
| 1875 | if (!skb->priority) | 1875 | if (!skb->priority) |
| 1876 | skb->priority = cfg80211_classify8021d(skb); | 1876 | skb->priority = cfg80211_classify8021d(skb, NULL); |
| 1877 | 1877 | ||
| 1878 | drvr->tx_multicast += !!multicast; | 1878 | drvr->tx_multicast += !!multicast; |
| 1879 | if (pae) | 1879 | if (pae) |