diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rc.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rc.c | 13 | 
1 files changed, 2 insertions, 11 deletions
| diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c index c1e065f136ba..f9f059dadb73 100644 --- a/drivers/net/wireless/rtlwifi/rc.c +++ b/drivers/net/wireless/rtlwifi/rc.c @@ -116,9 +116,8 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv,  		if (txrc->short_preamble)  			rate->flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE;  		if (mac->opmode == NL80211_IFTYPE_AP || -			mac->opmode == NL80211_IFTYPE_ADHOC) { -			if (sta && (sta->ht_cap.cap & -			    IEEE80211_HT_CAP_SUP_WIDTH_20_40)) +		    mac->opmode == NL80211_IFTYPE_ADHOC) { +			if (sta && (sta->bandwidth >= IEEE80211_STA_RX_BW_40))  				rate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;  		} else {  			if (mac->bw_40) @@ -223,13 +222,6 @@ static void rtl_rate_init(void *ppriv,  {  } -static void rtl_rate_update(void *ppriv, -			    struct ieee80211_supported_band *sband, -			    struct ieee80211_sta *sta, void *priv_sta, -			    u32 changed) -{ -} -  static void *rtl_rate_alloc(struct ieee80211_hw *hw,  		struct dentry *debugfsdir)  { @@ -275,7 +267,6 @@ static struct rate_control_ops rtl_rate_ops = {  	.alloc_sta = rtl_rate_alloc_sta,  	.free_sta = rtl_rate_free_sta,  	.rate_init = rtl_rate_init, -	.rate_update = rtl_rate_update,  	.tx_status = rtl_tx_status,  	.get_rate = rtl_get_rate,  }; |