diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-03 19:05:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-03 19:05:50 -0700 |
| commit | eca4c3d2dd66d0230140c9af05dee591df6f0e42 (patch) | |
| tree | 59167ea2ac39a78f626bb3905e495963af326b77 /include | |
| parent | f6caa14aa0b126d4a2933907d1519611b2a8524a (diff) | |
| parent | 99f1b01562b7dcae75b043114f76163fbf84fcab (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 1a21895b732b..d1892d66701a 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -979,6 +979,10 @@ struct cfg80211_ops { * channels at a later time. This can be used for devices which do not * have calibration information gauranteed for frequencies or settings * outside of its regulatory domain. + * @disable_beacon_hints: enable this if your driver needs to ensure that + * passive scan flags and beaconing flags may not be lifted by cfg80211 + * due to regulatory beacon hints. For more information on beacon + * hints read the documenation for regulatory_hint_found_beacon() * @reg_notifier: the driver's regulatory notification callback * @regd: the driver's regulatory domain, if one was requested via * the regulatory_hint() API. This can be used by the driver @@ -1004,6 +1008,7 @@ struct wiphy { bool custom_regulatory; bool strict_regulatory; + bool disable_beacon_hints; enum cfg80211_signal_type signal_type; |