diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 18:23:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 18:23:46 +0100 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /include/net/mac80211.h | |
| parent | ASoC: Allow WM8903 mic detect disable and don't force bias on (diff) | |
| parent | ASoC: Remove BROKEN from i.MX audio after dependencies merged (diff) | |
| download | linux-74511020dde10252f8b8e648690d99dba721de14.tar.xz linux-74511020dde10252f8b8e648690d99dba721de14.zip | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |