[v2,1/2] fff-network: Only use one Switch Port on Archer C7v2

Submitted by Fabian Blaese on Dec. 3, 2019, 5:43 p.m.

Details

Message ID 20191203174334.252664-1-fabian@blaese.de
State Accepted
Headers show

Commit Message

Fabian Blaese Dec. 3, 2019, 5:43 p.m.
Previously the TP-Link Archer C7v2 was configured to use
two Switch CPU Interfaces. One for Trunk (Client + Batman), one
for WAN.

As this setup is very uncommon in our firmware at the moment and does interfere
with the automatic CPU Port setup in layer3 variant, it is converted to a single
trunk port setup just like all of the other routers with integrated managed switches.

As eth0 is now used as the switchport, this change would require to setup
a different ETHMESHMAC if mac addresses would be shared between interfaces.

The device does seems to have 4 discrete mac addresses however, so the
explicit ETHMESHMAC setting is completely removed instead.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
---
Changes in v2:
- Use correct SWITCHDEV (eth1) for CPU-Port (0t)
---
 src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2
index 593bc2a..2328c3a 100644
--- a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2
+++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2
@@ -1,8 +1,7 @@ 
-WANDEV=eth0
+WANDEV=eth1
 SWITCHDEV=eth1
 CLIENT_PORTS="4 5 0t"
-WAN_PORTS="1 6"
+WAN_PORTS="1 0t"
 BATMAN_PORTS="2 3 0t"
 
-ETHMESHMAC=$(cat /sys/class/net/eth0/address)
 ROUTERMAC=$(cat /sys/class/net/eth1/address)

Comments

Christian Dresel Dec. 9, 2019, 2:35 p.m.
hi

ich kanns leider aus Mangel an Geräten nicht testen, da es davor aber
sowieso kaputt war, kann es hier nur besser sein und ansich sieht es
plausibel aus.

Reviewed-by: Christian Dresel <fff@chrisi01.de>

Gruß

Christian

On 03.12.19 18:43, Fabian Bläse wrote:
> Previously the TP-Link Archer C7v2 was configured to use
> two Switch CPU Interfaces. One for Trunk (Client + Batman), one
> for WAN.
> 
> As this setup is very uncommon in our firmware at the moment and does interfere
> with the automatic CPU Port setup in layer3 variant, it is converted to a single
> trunk port setup just like all of the other routers with integrated managed switches.
> 
> As eth0 is now used as the switchport, this change would require to setup
> a different ETHMESHMAC if mac addresses would be shared between interfaces.
> 
> The device does seems to have 4 discrete mac addresses however, so the
> explicit ETHMESHMAC setting is completely removed instead.
> 
> Signed-off-by: Fabian Bläse <fabian@blaese.de>
> ---
> Changes in v2:
> - Use correct SWITCHDEV (eth1) for CPU-Port (0t)
> ---
>  src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2
> index 593bc2a..2328c3a 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2
> +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2
> @@ -1,8 +1,7 @@
> -WANDEV=eth0
> +WANDEV=eth1
>  SWITCHDEV=eth1
>  CLIENT_PORTS="4 5 0t"
> -WAN_PORTS="1 6"
> +WAN_PORTS="1 0t"
>  BATMAN_PORTS="2 3 0t"
>  
> -ETHMESHMAC=$(cat /sys/class/net/eth0/address)
>  ROUTERMAC=$(cat /sys/class/net/eth1/address)
>
Fabian Blaese Dec. 9, 2019, 4 p.m.
Hey Christian,

On 09.12.19 15:35, Christian Dresel wrote:
> ich kanns leider aus Mangel an Geräten nicht testen, da es davor aber
> sowieso kaputt war, kann es hier nur besser sein und ansich sieht es
> plausibel aus.
war es das? Hätte eigentlich funktionieren müssen, macht nur das Setup in der Gatewayfirmware etwas ungewöhnlich.

Gruß
Fabian
Christian Dresel Dec. 10, 2019, 5:22 a.m.
Hi

Am 9. Dezember 2019 17:00:15 MEZ schrieb "Fabian Bläse" <fabian@blaese.de>:
>Hey Christian,
>
>On 09.12.19 15:35, Christian Dresel wrote:
>> ich kanns leider aus Mangel an Geräten nicht testen, da es davor aber
>> sowieso kaputt war, kann es hier nur besser sein und ansich sieht es
>> plausibel aus.
>war es das? Hätte eigentlich funktionieren müssen, macht nur das Setup
>in der Gatewayfirmware etwas ungewöhnlich.

So wie Alex über das Teil geschimpft hat, hat es sich für mich so angehört, ja.

Gruß

Christian

>
>Gruß
>Fabian
Fabian Blaese Dec. 10, 2019, 9:06 a.m.
applied.