diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-01 19:26:52 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-01 19:26:52 (GMT) |
| commit | 7546ff95499781306e8fd7d84ae38b84be961364 (patch) | |
| tree | 58416d00380ad1122acee71b594b26ab9a201e48 /drivers/net/wireless/iwlwifi | |
| parent | 2cdf359a521bb72286b6714478dfdbcd2691f3fe (diff) | |
| parent | c82b5a74cc739385db6e4275fe504a0e9469bf01 (diff) | |
| download | linux-fsl-qoriq-7546ff95499781306e8fd7d84ae38b84be961364.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rs.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/rs.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c index 1b69394..91eb09b 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rs.c +++ b/drivers/net/wireless/iwlwifi/dvm/rs.c @@ -3319,7 +3319,8 @@ static void rs_remove_debugfs(void *priv, void *priv_sta) * station is added we ignore it. */ static void rs_rate_init_stub(void *priv_r, struct ieee80211_supported_band *sband, - struct ieee80211_sta *sta, void *priv_sta) + struct cfg80211_chan_def *chandef, + struct ieee80211_sta *sta, void *priv_sta) { } static struct rate_control_ops rs_ops = { diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c index b328a98..376ea21 100644 --- a/drivers/net/wireless/iwlwifi/mvm/rs.c +++ b/drivers/net/wireless/iwlwifi/mvm/rs.c @@ -3159,8 +3159,9 @@ static void rs_remove_debugfs(void *mvm, void *mvm_sta) * station is added we ignore it. */ static void rs_rate_init_stub(void *mvm_r, - struct ieee80211_supported_band *sband, - struct ieee80211_sta *sta, void *mvm_sta) + struct ieee80211_supported_band *sband, + struct cfg80211_chan_def *chandef, + struct ieee80211_sta *sta, void *mvm_sta) { } static struct rate_control_ops rs_mvm_ops = { |