diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /net/wireless/reg.h | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'net/wireless/reg.h')
| -rw-r--r-- | net/wireless/reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/reg.h b/net/wireless/reg.h index 662a9dad76d5..3362c7c069b2 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h | |||
| @@ -30,7 +30,8 @@ int set_regdom(const struct ieee80211_regdomain *rd); | |||
| 30 | * non-radar 5 GHz channels. | 30 | * non-radar 5 GHz channels. |
| 31 | * | 31 | * |
| 32 | * Drivers do not need to call this, cfg80211 will do it for after a scan | 32 | * Drivers do not need to call this, cfg80211 will do it for after a scan |
| 33 | * on a newly found BSS. | 33 | * on a newly found BSS. If you cannot make use of this feature you can |
| 34 | * set the wiphy->disable_beacon_hints to true. | ||
| 34 | */ | 35 | */ |
| 35 | int regulatory_hint_found_beacon(struct wiphy *wiphy, | 36 | int regulatory_hint_found_beacon(struct wiphy *wiphy, |
| 36 | struct ieee80211_channel *beacon_chan, | 37 | struct ieee80211_channel *beacon_chan, |