Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[deliverable/linux.git] / drivers / net / wireless / brcm80211 / brcmfmac / commonring.h

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/commonring.h b/drivers/net/wireless/brcm80211/brcmfmac/commonring.h
index 002336e3576404097cd18dd0be5f6800ed2cb112..3d404016a92eb9e5cdcbcf49c9872d0e5a2966bf 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/commonring.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/commonring.h
@@ -37,6 +37,8 @@ struct brcmf_commonring {
        unsigned long flags;
        bool inited;
        bool was_full;
+
+       atomic_t outstanding_tx;
 };