Skip to content

Commit c1cb40f

Browse files
maurerlemaurerle
committed
remove hacks for third radio for now
1 parent 7d757d2 commit c1cb40f

1 file changed

Lines changed: 21 additions & 88 deletions

File tree

‎patches/targets-ipq40xx-generic.patch‎

Lines changed: 21 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,69 @@
11
diff --git a/targets/ipq40xx-generic b/targets/ipq40xx-generic
2-
index 85509de7..a4a81b44 100644
2+
index 85509de7..251396ec 100644
33
--- a/targets/ipq40xx-generic
44
+++ b/targets/ipq40xx-generic
5-
@@ -14,6 +14,15 @@ local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
6-
'ath10k-firmware-qca9888',
7-
'-ath10k-firmware-qca9888-ct',
8-
}
9-
+local ATH10K_PACKAGES_IPQ40XX_QCA9984 = {
10-
+ 'kmod-ath10k',
11-
+ '-kmod-ath10k-ct',
12-
+ '-kmod-ath10k-ct-smallbuffers',
13-
+ 'ath10k-firmware-qca4019',
14-
+ '-ath10k-firmware-qca4019-ct',
15-
+ 'ath10k-firmware-qca9984',
16-
+ '-ath10k-firmware-qca9984-ct',
17-
+}
5+
@@ -60,12 +60,9 @@ device('avm-fritz-box-7530', 'avm_fritzbox-7530', {
6+
'-ath10k-firmware-qca4019-ct',
187

19-
20-
defaults {
21-
@@ -51,28 +60,29 @@ device('avm-fritz-box-4040', 'avm_fritzbox-4040', {
22-
device('avm-fritz-box-7530', 'avm_fritzbox-7530', {
23-
factory = false,
24-
aliases = {'avm-fritz-box-7520'},
25-
packages = {
26-
- -- same as ATH10K_PACKAGES_IPQ40XX
27-
- 'kmod-ath10k',
28-
- '-kmod-ath10k-ct',
29-
- '-kmod-ath10k-ct-smallbuffers',
30-
- 'ath10k-firmware-qca4019',
31-
- '-ath10k-firmware-qca4019-ct',
32-
-
33-
-- VDSL modem
34-
+ 'ppp',
35-
+ 'kmod-ppp',
36-
+ 'ppp-mod-pppoe',
8+
-- VDSL modem
379
- '-kmod-ltq-vdsl-vr11',
3810
- '-kmod-ltq-vdsl-vr11-mei',
3911
- '-ltq-vdsl-vr11-app',
4012
- '-ltq-dsl-base',
4113
- '-kmod-atm',
4214
- '-linux-atm',
43-
},
15+
+ 'ppp',
16+
+ 'kmod-ppp',
17+
+ 'ppp-mod-pppoe',
18+
},
4419
})
4520

46-
device('avm-fritz-repeater-1200', 'avm_fritzrepeater-1200', {
21+
@@ -73,6 +70,15 @@ device('avm-fritz-repeater-1200', 'avm_fritzrepeater-1200', {
4722
factory = false,
4823
})
4924

5025
+device('avm-fritz-repeater-3000', 'avm_fritzrepeater-3000', {
5126
+ factory = false,
52-
+ packages = { -- exclude until Gluon supports third radio
53-
+ 'kmod-ath10k',
54-
+ '-kmod-ath10k-ct',
55-
+ '-kmod-ath10k-ct-smallbuffers',
56-
+ 'ath10k-firmware-qca4019',
57-
+ '-ath10k-firmware-qca4019-ct',
58-
+ '-ath10k-firmware-qca9984-ct',
59-
+ '-ath10k-board-qca9984',
60-
+ },
61-
+ broken = true,
62-
+ -- 3rd WiFi radio not supported (5GHz DFS channels 100+)
63-
+ -- outdoor mode is broken due to 5GHz being limited to channels 36-64
6427
+})
6528
+
29+
+-- Extreme Networks
6630
+
31+
+device('extreme-networks-ws-ap3915i', 'extreme-networks_ws-ap3915i', {
32+
+ factory = false,
33+
+})
6734

6835
-- GL.iNet
6936

70-
@@ -89,6 +99,36 @@ device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
37+
@@ -89,13 +95,23 @@ device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
7138

7239
device('linksys-ea6350v3', 'linksys_ea6350v3')
7340

74-
+device('linksys-ea8300-dallas', 'linksys_ea8300', {
75-
+ packages = { -- exclude until Gluon supports third radio
76-
+ 'kmod-ath10k',
77-
+ '-kmod-ath10k-ct',
78-
+ '-kmod-ath10k-ct-smallbuffers',
79-
+ 'ath10k-firmware-qca4019',
80-
+ '-ath10k-firmware-qca4019-ct',
81-
+ '-ath10k-firmware-qca9888-ct',
82-
+ '-ath10k-board-qca9888',
83-
+ },
84-
+ broken = true,
85-
+ -- 3rd WiFi radio not supported (5GHz DFS channels 100+)
86-
+ -- outdoor mode is broken due to 5GHz being limited to channels 36-64
87-
+})
41+
+device('linksys-ea8300-dallas', 'linksys_ea8300')
8842
+
89-
+device('linksys-mr8300-dallas', 'linksys_mr8300', {
90-
+ packages = { -- exclude until Gluon supports third radio
91-
+ 'kmod-ath10k',
92-
+ '-kmod-ath10k-ct',
93-
+ '-kmod-ath10k-ct-smallbuffers',
94-
+ 'ath10k-firmware-qca4019',
95-
+ '-ath10k-firmware-qca4019-ct',
96-
+ '-ath10k-firmware-qca9888-ct',
97-
+ '-ath10k-board-qca9888',
98-
+ },
99-
+ broken = true,
100-
+ -- 3rd WiFi radio not supported (5GHz DFS channels 100+)
101-
+ -- outdoor mode is broken due to 5GHz being limited to channels 36-64
102-
+})
43+
+device('linksys-mr8300-dallas', 'linksys_mr8300')
10344
+
10445

10546
-- Meraki
10647

107-
@@ -96,6 +136,11 @@ device('meraki-mr33-access-point', 'meraki_mr33', {
48+
device('meraki-mr33-access-point', 'meraki_mr33', {
10849
packages = {
109-
-- radio0 is monitoring radio - removed for now
50+
- -- radio0 is monitoring radio - removed for now
11051
-- the -ct firmware does not have working mesh
52+
+ -- use non ct for now
11153
+ 'kmod-ath10k',
11254
+ '-kmod-ath10k-ct',
11355
+ '-kmod-ath10k-ct-smallbuffers',
11456
+ 'ath10k-firmware-qca4019',
11557
+ '-ath10k-firmware-qca4019-ct',
58+
+ -- radio0 is monitoring radio - removed for now
11659
'-ath10k-firmware-qca9887-ct',
11760
'-ath10k-board-qca9887',
11861
},
119-
@@ -139,6 +184,7 @@ device('plasma-cloud-pa2200', 'plasmacloud_pa2200', {
62+
@@ -139,6 +155,7 @@ device('plasma-cloud-pa2200', 'plasmacloud_pa2200', {
12063
-- ZTE
12164

12265
device('zte-mf289f', 'zte_mf289f', {
12366
+ packages = ATH10K_PACKAGES_IPQ40XX_QCA9984,
12467
broken = true, -- case must be opened to install
12568
factory = false,
12669
})
127-
@@ -154,3 +200,9 @@ device('zyxel-nbg6617', 'zyxel_nbg6617')
128-
device('8devices-jalapeno', '8dev_jalapeno', {
129-
factory_ext = '.ubi',
130-
})
131-
+
132-
+-- Extreme Networks
133-
+
134-
+device('extreme-networks-ws-ap3915i', 'extreme-networks_ws-ap3915i', {
135-
+ factory = false,
136-
+})

0 commit comments

Comments
 (0)