diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-05-09 18:54:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-09 18:54:49 -0400 |
| commit | 2c4f365ad2361c93c097e958b2b0a7a112750228 (patch) | |
| tree | 83c046142a6e057f005b97b4b7356cd4ff7a9783 /include/net | |
| parent | 3cb7396b7b26585b1ab7c1a8ca554ec103da5d37 (diff) | |
| parent | 47c93d2faf9d7e94393852823480ea61c868caee (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ieee80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index d56b2923d61a..bbd85cd61ed5 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
| @@ -1291,6 +1291,8 @@ extern u8 ieee80211_get_channel_flags(struct ieee80211_device *ieee, | |||
| 1291 | extern const struct ieee80211_channel *ieee80211_get_channel(struct | 1291 | extern const struct ieee80211_channel *ieee80211_get_channel(struct |
| 1292 | ieee80211_device | 1292 | ieee80211_device |
| 1293 | *ieee, u8 channel); | 1293 | *ieee, u8 channel); |
| 1294 | extern u32 ieee80211_channel_to_freq(struct ieee80211_device * ieee, | ||
| 1295 | u8 channel); | ||
| 1294 | 1296 | ||
| 1295 | /* ieee80211_wx.c */ | 1297 | /* ieee80211_wx.c */ |
| 1296 | extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee, | 1298 | extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee, |