diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-12 21:59:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-12 21:59:18 -0700 |
| commit | 43b03f1f6d6832d744918947d185a7aee89d1e0f (patch) | |
| tree | 53a8c47d67dfcd23450d4068d08ccf2b7714c5e8 /drivers/net/wireless/b43/b43.h | |
| parent | 2da45db2bdd432a9dca825099c791f5c851f92b9 (diff) | |
| parent | 5ee31c6898ea5537fcea160999d60dc63bc0c305 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
MAINTAINERS
drivers/net/wireless/iwlwifi/pcie/trans.c
The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.
The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
| -rw-r--r-- | drivers/net/wireless/b43/b43.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index 67c13af6f206..c06b6cb5c91e 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h @@ -877,6 +877,10 @@ struct b43_wl { * from the mac80211 subsystem. */ u16 mac80211_initially_registered_queues; + /* Set this if we call ieee80211_register_hw() and check if we call + * ieee80211_unregister_hw(). */ + bool hw_registred; + /* We can only have one operating interface (802.11 core) * at a time. General information about this interface follows. */ |