[OpenWrt-Devel] 18.06.2 branching/builds

[Felix Fietkau]

On 2019-01-30 16:58, Stijn Segers wrote:
> Hi Jo, Felix,
> 
> Far be it from me to pretend this issue might have a larger impact than
> I myself can assess, but Felix has been bumping mt76 on the 18.06
> branch, and those bumps have broken my 18.06.1+ mt7621 wireless [1]
> (and, judging from Flyspray, at least one other person's as well).
> 
> I have no idea how many people are running both mt7621 and 18.06 HEAD
> (like me and the other guy), so this might be an isolated issue, but I
> do know wireless craps out on me within a few minutes and the AP needs
> to be brought up again; it's not just a matter of worse performance but
> outright disconnection.
> 
> So I'd like to ask if 18.06.2 could be released with a fix/with those
> mt76 rolled back.
Hey Stijn,

Thanks for bringing this to my attention again.
Could you please test the two attached patches individually with the
latest 18.06 branch to see if either of them resolves your issue?

I've been doing a lot of tests lately with both MT7603 and MT7612E on
MT7621, and I have been unable to reproduce your issues so far.

Thanks,

- Felix
-------------- next part --------------
diff --git a/mt76x02_dfs.c b/mt76x02_dfs.c
index 19fdcab..57aba62 100644
--- a/mt76x02_dfs.c
+++ b/mt76x02_dfs.c
@@ -885,7 +885,7 @@ mt76x02_dfs_set_domain(struct mt76x02_dev *dev,
 	if (dfs_pd->region != region) {
 		tasklet_disable(&dfs_pd->dfs_tasklet);
 
-		dev->ed_monitor = region == NL80211_DFS_ETSI;
+		dev->ed_monitor = 0; // region == NL80211_DFS_ETSI;
 		mt76x02_edcca_init(dev);
 
 		dfs_pd->region = region;
diff --git a/mt76x02_mac.c b/mt76x02_mac.c
index 166f20b..0c475ad 100644
--- a/mt76x02_mac.c
+++ b/mt76x02_mac.c
@@ -889,6 +889,7 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev)
 			mt76_set(dev, MT_TXOP_HLDR_ET,
 				 MT_TXOP_HLDR_TX40M_BLK_EN);
 	} else {
+		return;
 		mt76_set(dev, MT_TX_LINK_CFG, MT_TX_CFACK_EN);
 		mt76_clear(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);
 		if (is_mt76x2(dev)) {
-------------- next part --------------
diff --git a/mt76x2/pci_main.c b/mt76x2/pci_main.c
index 06a26a1..9ef196a 100644
--- a/mt76x2/pci_main.c
+++ b/mt76x2/pci_main.c
@@ -34,8 +34,10 @@ mt76x2_start(struct ieee80211_hw *hw)
 
 	ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
 				     MT_CALIBRATE_INTERVAL);
+#if 0
 	ieee80211_queue_delayed_work(mt76_hw(dev), &dev->wdt_work,
 				     MT_WATCHDOG_TIME);
+#endif
 
 	set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
 
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel