diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-04 07:42:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-04 07:42:54 +0100 |
| commit | e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3 (patch) | |
| tree | 5ed22d681be9cc6a3677d61b0a19fcea5702d98c /include | |
| parent | bridge: depends on INET (diff) | |
| parent | rt2x00: Export rt2x00soc_probe from rt2x00soc (diff) | |
| download | linux-e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3.tar.xz linux-e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rfkill.h | 2 | ||||
| -rw-r--r-- | include/net/mac80211.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index 97059d08a626..4f82326eb294 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h @@ -29,7 +29,7 @@ /** * enum rfkill_type - type of rfkill switch. * - * @RFKILL_TYPE_ALL: toggles all switches (userspace only) + * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type) * @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device. * @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device. * @RFKILL_TYPE_UWB: switch is on a ultra wideband device. diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 80eb7cc42ce9..45d7d44d7cbe 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -2426,7 +2426,8 @@ struct rate_control_ops { struct ieee80211_sta *sta, void *priv_sta); void (*rate_update)(void *priv, struct ieee80211_supported_band *sband, struct ieee80211_sta *sta, - void *priv_sta, u32 changed); + void *priv_sta, u32 changed, + enum nl80211_channel_type oper_chan_type); void (*free_sta)(void *priv, struct ieee80211_sta *sta, void *priv_sta); |