| Message ID | 20170929194800.15617-2-Larry.Finger@lwfinger.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f06eb3f9c03eda3bf7e40b49f5a4b032752bb176 |
| Delegated to: | Kalle Valo |
| Headers | show |
Larry Finger <Larry.Finger@lwfinger.net> wrote: > From: Ping-Ke Shih <pkshih@realtek.com> > > We must choose only one of VHT_CAP among > IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895, > IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 and > IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454. > > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> > Cc: Yan-Hsuan Chuang <yhchuang@realtek.com> > Cc: Birming Chiu <birming@realtek.com> > Cc: Shaofu <shaofu@realtek.com> > Cc: Steven Ting <steventing@realtek.com> 10 patches applied to wireless-drivers-next.git, thanks. f06eb3f9c03e rtlwifi: Fix MAX MPDU of VHT capability ecf4000e0d92 rtlwifi: Remove redundant semicolon in wifi.h. 0c07bd745760 rtlwifi: rtl8192ee: Make driver support 64bits DMA. cdc9c7a032aa rtlwifi: Implement rtl_get_tx_hw_rate to yield correct hw_rate c1816f1709e8 rtlwifi: Add rtl_get_hal_edca_param() to generate register's format of EDCA. 74451b935c42 rtlwifi: Add TX/RX throughput statistics in period 08ab7465f36c rtlwifi: Add RSSI and RF type to wifi.h for phydm aa59a1e7c6e8 rtlwifi: Remove BAND_NUM and related fields 1d22b17744a3 rtlwifi: Add bw_update parameter for RA mask update. 84efbad4f867 rtlwifi: Add module parameter ASPM
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index ea18aa7afecb..fcf6e31d0fb9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -249,8 +249,6 @@ static void _rtl_init_hw_vht_capab(struct ieee80211_hw *hw, vht_cap->vht_supported = true; vht_cap->cap = - IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 | - IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 | IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 | IEEE80211_VHT_CAP_SHORT_GI_80 | IEEE80211_VHT_CAP_TXSTBC | @@ -283,8 +281,6 @@ static void _rtl_init_hw_vht_capab(struct ieee80211_hw *hw, vht_cap->vht_supported = true; vht_cap->cap = - IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 | - IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 | IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 | IEEE80211_VHT_CAP_SHORT_GI_80 | IEEE80211_VHT_CAP_TXSTBC |