diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-29 16:28:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 16:28:28 -0700 |
| commit | dd7f36ba3ce17d4fe85987d83efd5901b0935816 (patch) | |
| tree | bad385290c22f6e10c2f587af4b9df0dfeb99e8b /drivers/net/wireless/ath/ath6kl/cfg80211.h | |
| parent | ae0eef66088777cf252c6b91d3eb5ef2f30a67c5 (diff) | |
| parent | 8732baafc3f19e69df683c3f0f36c13cec746fb9 (diff) | |
| download | op-kernel-dev-dd7f36ba3ce17d4fe85987d83efd5901b0935816.zip op-kernel-dev-dd7f36ba3ce17d4fe85987d83efd5901b0935816.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John Linville says:
====================
Here is another batch of updates intended for 3.6. This includes a
number of pulls, including ones from the mac80211, iwlwifi, ath6kl, and
wl12xx trees. I also pulled from the wireless tree to avoid potential
build conflicts. There are a number of other patches applied directly,
including a number for the Broadcom drivers and the mwifiex driver.
The updates cover the usual variety of new hardware support and feature
enhancements. It's all good work, but there aren't any big headliners.
This does resolve a net-next/wireless-next merge conflict reported
by Stephen.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h index 5ea8cbb..b992046 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.h +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h @@ -62,5 +62,7 @@ void ath6kl_cfg80211_cleanup(struct ath6kl *ar); struct ath6kl *ath6kl_cfg80211_create(void); void ath6kl_cfg80211_destroy(struct ath6kl *ar); +/* TODO: remove this once ath6kl_vif_cleanup() is moved to cfg80211.c */ +void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable); #endif /* ATH6KL_CFG80211_H */ |
