diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-12-25 16:34:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-25 16:34:56 -0800 |
| commit | d346f49d0badd80aa9fc699fa9c6d5b23e778eb6 (patch) | |
| tree | 9e9698ffe7966fbe7ce924a30843f87cdfa2646e /net/wireless/core.h | |
| parent | enic: whitespace cleanup; #define cleanup; more verbose err msg (diff) | |
| parent | ath9k: Fix TX poll routine (diff) | |
| download | linux-dev-d346f49d0badd80aa9fc699fa9c6d5b23e778eb6.tar.xz linux-dev-d346f49d0badd80aa9fc699fa9c6d5b23e778eb6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 4ef3efc94106..35b712127143 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -378,6 +378,8 @@ int rdev_set_freq(struct cfg80211_registered_device *rdev, struct wireless_dev *for_wdev, int freq, enum nl80211_channel_type channel_type); +u16 cfg80211_calculate_bitrate(struct rate_info *rate); + #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS #define CFG80211_DEV_WARN_ON(cond) WARN_ON(cond) #else |