fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mt76: refresh patches"

Browse Source 
This reverts commit bbec2ebb54.
This commit is contained in:
CN_SZTL 2020-04-04 00:45:29 +08:00
parent 676620a860
commit cc7bc7b824
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/kernel/mt76/patches/001-allow-vht-on-2g.patch
View File

@ -1,26 +1,24 @@
diff --git a/mac80211.c b/mac80211.c
index 19da447..136da14 100644
--- a/mac80211.c --- a/mac80211.c
+++ b/mac80211.c +++ b/mac80211.c
@@ -156,7 +156,7 @@ static void mt76_init_stream_cap(struct mt76_dev *dev, @@ -156,7 +156,7 @@ static void mt76_init_stream_cap(struct
void mt76_set_stream_caps(struct mt76_dev *dev, bool vht) void mt76_set_stream_caps(struct mt76_dev *dev, bool vht)
{ {
if (dev->cap.has_2ghz) if (dev->cap.has_2ghz)
- mt76_init_stream_cap(dev, &dev->sband_2g.sband, false); - mt76_init_stream_cap(dev, &dev->phy.sband_2g.sband, false);
+ mt76_init_stream_cap(dev, &dev->sband_2g.sband, vht); + mt76_init_stream_cap(dev, &dev->phy.sband_2g.sband, vht);
if (dev->cap.has_5ghz) if (dev->cap.has_5ghz)
mt76_init_stream_cap(dev, &dev->sband_5g.sband, vht); mt76_init_stream_cap(dev, &dev->phy.sband_5g.sband, vht);
} }
@@ -221,14 +221,14 @@ mt76_init_sband(struct mt76_dev *dev, struct mt76_sband *msband, @@ -219,14 +219,14 @@ mt76_init_sband(struct mt76_dev *dev, st
static int static int
mt76_init_sband_2g(struct mt76_dev *dev, struct ieee80211_rate *rates, mt76_init_sband_2g(struct mt76_dev *dev, struct ieee80211_rate *rates,
- int n_rates) - int n_rates)
+ int n_rates, bool vht) + int n_rates, bool vht)
{ {
dev->hw->wiphy->bands[NL80211_BAND_2GHZ] = &dev->sband_2g.sband; dev->hw->wiphy->bands[NL80211_BAND_2GHZ] = &dev->phy.sband_2g.sband;
return mt76_init_sband(dev, &dev->sband_2g, return mt76_init_sband(dev, &dev->phy.sband_2g,
mt76_channels_2ghz, mt76_channels_2ghz,
ARRAY_SIZE(mt76_channels_2ghz), ARRAY_SIZE(mt76_channels_2ghz),
- rates, n_rates, false); - rates, n_rates, false);
@ -28,8 +26,8 @@ index 19da447..136da14 100644
} }
static int static int
@@ -349,7 +349,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, @@ -446,7 +446,7 @@ int mt76_register_device(struct mt76_dev
BIT(NL80211_IFTYPE_ADHOC); mt76_phy_init(dev, hw);
if (dev->cap.has_2ghz) { if (dev->cap.has_2ghz) {
- ret = mt76_init_sband_2g(dev, rates, n_rates); - ret = mt76_init_sband_2g(dev, rates, n_rates);