diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-27 16:00:37 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-27 16:00:37 -0800 |
commit | 8571a19c4ac140f1a507f3e7eb716892afa27109 (patch) | |
tree | 55ef6a0ab68d6388177d3290a7fd6bc3f12a381f /include/net/cfg80211.h | |
parent | sungem: Use net_device's internal stats (diff) | |
parent | ath9k: fix misplaced debug code (diff) | |
download | linux-dev-8571a19c4ac140f1a507f3e7eb716892afa27109.tar.xz linux-dev-8571a19c4ac140f1a507f3e7eb716892afa27109.zip |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/net/cfg80211.h')
-rw-r--r-- | include/net/cfg80211.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 1322695beb52..679a0494b5f2 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1790,8 +1790,9 @@ static inline void *wdev_priv(struct wireless_dev *wdev) /** * ieee80211_channel_to_frequency - convert channel number to frequency * @chan: channel number + * @band: band, necessary due to channel number overlap */ -extern int ieee80211_channel_to_frequency(int chan); +extern int ieee80211_channel_to_frequency(int chan, enum ieee80211_band band); /** * ieee80211_frequency_to_channel - convert frequency to channel number |