diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-04 01:42:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-04 01:42:54 -0500 |
| commit | e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3 (patch) | |
| tree | 5ed22d681be9cc6a3677d61b0a19fcea5702d98c /include/net | |
| parent | 1cd4efddc4512ccbd9fe317f688f361605ca0c88 (diff) | |
| parent | 31f66be44a657a14e0ab3536e4877c66c9ce031e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/net')
| -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 { | |||
| 2426 | struct ieee80211_sta *sta, void *priv_sta); | 2426 | struct ieee80211_sta *sta, void *priv_sta); |
| 2427 | void (*rate_update)(void *priv, struct ieee80211_supported_band *sband, | 2427 | void (*rate_update)(void *priv, struct ieee80211_supported_band *sband, |
| 2428 | struct ieee80211_sta *sta, | 2428 | struct ieee80211_sta *sta, |
| 2429 | void *priv_sta, u32 changed); | 2429 | void *priv_sta, u32 changed, |
| 2430 | enum nl80211_channel_type oper_chan_type); | ||
| 2430 | void (*free_sta)(void *priv, struct ieee80211_sta *sta, | 2431 | void (*free_sta)(void *priv, struct ieee80211_sta *sta, |
| 2431 | void *priv_sta); | 2432 | void *priv_sta); |
| 2432 | 2433 | ||