298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: refresh patches (#10689)

Browse Source 
Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
This commit is contained in:
lovehackintosh 2022-12-28 01:15:34 +08:00 committed by GitHub
parent 32330e1a15
commit b2eafb1cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 122 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

283
package/kernel/mt76/patches/001-Revert-sync-with-upstream.patch
View File

File diff suppressed because it is too large Load Diff

40
package/kernel/mt76/patches/002-Revert-wifi-mt76-mt7921-introduce-chanctx-support.patch
View File

@ -14,11 +14,9 @@ This reverts commit 2575de3aea332837a0784629b11146efa1c55e58.
mt7921/usb.c | 7 ---
7 files changed, 17 insertions(+), 157 deletions(-)
diff --git a/mt7921/init.c b/mt7921/init.c
index 9bf5d9f0..c16aeab0 100644
--- a/mt7921/init.c
+++ b/mt7921/init.c
@@ -26,27 +26,6 @@ static const struct ieee80211_iface_combination if_comb[] = {
@@ -26,27 +26,6 @@ static const struct ieee80211_iface_comb
.max_interfaces = MT7921_MAX_INTERFACES,
.num_different_channels = 1,
.beacon_int_infra_match = true,
@ -46,7 +44,7 @@ index 9bf5d9f0..c16aeab0 100644
}
};
@@ -88,19 +67,17 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)
@@ -88,19 +67,17 @@ mt7921_init_wiphy(struct ieee80211_hw *h
hw->sta_data_size = sizeof(struct mt7921_sta);
hw->vif_data_size = sizeof(struct mt7921_vif);
@ -71,8 +69,6 @@ index 9bf5d9f0..c16aeab0 100644
wiphy->max_remain_on_channel_duration = 5000;
wiphy->max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN;
wiphy->max_scan_ssids = 4;
diff --git a/mt7921/mac.c b/mt7921/mac.c
index 47f79f16..639614b0 100644
--- a/mt7921/mac.c
+++ b/mt7921/mac.c
@@ -168,6 +168,14 @@ static void
@ -90,11 +86,9 @@ index 47f79f16..639614b0 100644
if (chfreq > 180) {
status->band = NL80211_BAND_6GHZ;
chfreq = (chfreq - 181) * 4 + 1;
diff --git a/mt7921/main.c b/mt7921/main.c
index a1611590..1b7219e3 100644
--- a/mt7921/main.c
+++ b/mt7921/main.c
@@ -856,7 +856,7 @@ void mt7921_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -851,7 +851,7 @@ void mt7921_mac_sta_assoc(struct mt76_de
if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls)
mt76_connac_mcu_uni_add_bss(&dev->mphy, vif, &mvif->sta.wcid,
@ -103,7 +97,7 @@ index a1611590..1b7219e3 100644
mt7921_mac_wtbl_update(dev, msta->wcid.idx,
MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
@@ -889,7 +889,7 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -884,7 +884,7 @@ void mt7921_mac_sta_remove(struct mt76_d
if (!sta->tdls)
mt76_connac_mcu_uni_add_bss(&dev->mphy, vif,
&mvif->sta.wcid, false,
@ -112,7 +106,7 @@ index a1611590..1b7219e3 100644
}
spin_lock_bh(&dev->sta_poll_lock);
@@ -1649,7 +1649,7 @@ mt7921_start_ap(struct ieee80211_hw *hw,
@@ -1644,7 +1644,7 @@ mt7921_start_ap(struct ieee80211_hw *hw,
mt7921_mutex_acquire(dev);
err = mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid,
@ -121,7 +115,7 @@ index a1611590..1b7219e3 100644
if (err)
goto out;
@@ -1681,108 +1681,12 @@ mt7921_stop_ap(struct ieee80211_hw *hw,
@@ -1676,105 +1676,12 @@ mt7921_stop_ap(struct ieee80211_hw *hw,
goto out;
mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, false,
@ -221,17 +215,14 @@ index a1611590..1b7219e3 100644
- struct ieee80211_prep_tx_info *info)
-{
- struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
- struct mt7921_dev *dev = mt7921_hw_dev(hw);
-
- mt7921_mutex_acquire(dev);
- mt7921_abort_roc(mvif->phy, mvif);
- mt7921_mutex_release(dev);
-}
-
const struct ieee80211_ops mt7921_ops = {
.tx = mt7921_tx,
.start = mt7921_start,
@@ -1835,13 +1739,6 @@ const struct ieee80211_ops mt7921_ops = {
@@ -1827,13 +1734,6 @@ const struct ieee80211_ops mt7921_ops =
.set_sar_specs = mt7921_set_sar_specs,
.remain_on_channel = mt7921_remain_on_channel,
.cancel_remain_on_channel = mt7921_cancel_remain_on_channel,
@ -245,8 +236,6 @@ index a1611590..1b7219e3 100644
};
EXPORT_SYMBOL_GPL(mt7921_ops);
diff --git a/mt7921/mt7921.h b/mt7921/mt7921.h
index efff4d43..0954ac6c 100644
--- a/mt7921/mt7921.h
+++ b/mt7921/mt7921.h
@@ -171,7 +171,6 @@ struct mt7921_vif {
@ -257,11 +246,9 @@ index efff4d43..0954ac6c 100644
};
struct mib_stats {
diff --git a/mt7921/pci.c b/mt7921/pci.c
index d84dbdd1..fbb06f04 100644
--- a/mt7921/pci.c
+++ b/mt7921/pci.c
@@ -297,13 +297,6 @@ static int mt7921_pci_probe(struct pci_dev *pdev,
@@ -297,13 +297,6 @@ static int mt7921_pci_probe(struct pci_d
if (!(features & MT7921_FW_CAP_CNM)) {
ops->remain_on_channel = NULL;
ops->cancel_remain_on_channel = NULL;
@ -275,11 +262,9 @@ index d84dbdd1..fbb06f04 100644
}
mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), ops, &drv_ops);
diff --git a/mt7921/sdio.c b/mt7921/sdio.c
index 3f8973fb..f6b35087 100644
--- a/mt7921/sdio.c
+++ b/mt7921/sdio.c
@@ -140,13 +140,6 @@ static int mt7921s_probe(struct sdio_func *func,
@@ -140,13 +140,6 @@ static int mt7921s_probe(struct sdio_fun
if (!(features & MT7921_FW_CAP_CNM)) {
ops->remain_on_channel = NULL;
ops->cancel_remain_on_channel = NULL;
@ -293,11 +278,9 @@ index 3f8973fb..f6b35087 100644
}
mdev = mt76_alloc_device(&func->dev, sizeof(*dev), ops, &drv_ops);
diff --git a/mt7921/usb.c b/mt7921/usb.c
index 5321d20d..8a49d3de 100644
--- a/mt7921/usb.c
+++ b/mt7921/usb.c
@@ -218,13 +218,6 @@ static int mt7921u_probe(struct usb_interface *usb_intf,
@@ -218,13 +218,6 @@ static int mt7921u_probe(struct usb_inte
if (!(features & MT7921_FW_CAP_CNM)) {
ops->remain_on_channel = NULL;
ops->cancel_remain_on_channel = NULL;
@ -311,6 +294,3 @@ index 5321d20d..8a49d3de 100644
}
ops->stop = mt7921u_stop;
--
2.17.1

6
package/kernel/mt76/patches/003-Revert-changed-IEEE80211_MAX_AMPDU_BUF-defi.patch
View File

@ -15,11 +15,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
mt7915/init.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mt7915/init.c b/mt7915/init.c
index 489f6e77..1813370a 100644
--- a/mt7915/init.c
+++ b/mt7915/init.c
@@ -327,8 +327,8 @@ mt7915_init_wiphy(struct ieee80211_hw *hw)
@@ -329,8 +329,8 @@ mt7915_init_wiphy(struct mt7915_phy *phy
struct mt7915_dev *dev = phy->dev;
hw->queues = 4;
@ -30,5 +28,3 @@ index 489f6e77..1813370a 100644
hw->netdev_features = NETIF_F_RXCSUM;
hw->radiotap_timestamp.units_pos =
--
2.37.2

2
package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch
View File

@ -1,6 +1,6 @@
--- a/mt7921/pci_mac.c
+++ b/mt7921/pci_mac.c
@@ -261,7 +261,7 @@ int mt7921e_mac_reset(struct mt7921_dev *dev)
@@ -113,7 +113,7 @@ int mt7921e_mac_reset(struct mt7921_dev
err = mt7921e_driver_own(dev);
if (err)

2
package/kernel/mt76/patches/090-backport-to-linux-5.19.patch
View File

@ -1,6 +1,6 @@
--- a/usb.c
+++ b/usb.c
@@ -1068,7 +1068,11 @@
@@ -1075,7 +1075,11 @@ int __mt76u_init(struct mt76_dev *dev, s
INIT_WORK(&usb->stat_work, mt76u_tx_status_data);

8
package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
View File

@ -1,6 +1,6 @@
--- a/mt7921/dma.c
--- b/mt7921/dma.c
@@ -283,10 +283,15 @@
+++ b/mt7921/dma.c
@@ -283,10 +283,15 @@ int mt7921_dma_init(struct mt7921_dev *d
if (ret < 0)
return ret;
@ -18,8 +18,8 @@
}
--- a/dma.c
--- b/dma.c
@@ -895,7 +895,11 @@
+++ b/dma.c
@@ -910,7 +910,11 @@ mt76_dma_init(struct mt76_dev *dev,
dev->napi_dev.threaded = 1;
mt76_for_each_q_rx(dev, i) {