[LEDE-DEV] ar71xx: fix switch port numbering on RB951Ui-2nD

Message ID D5BEB715-BF1A-40FB-B180-63695E16D889@gmail.com
State New
Headers show
Series
  • [LEDE-DEV] ar71xx: fix switch port numbering on RB951Ui-2nD
Related show

Commit Message

João Chaínho Oct. 12, 2017, 8:03 a.m.
This patch fixes the switch port numbering on Mikrotik RB951Ui-2nD (hAP).

Signed-off-by: João Chaínho <joaochainho@gmail.com>
---

Comments

Hauke Mehrtens Oct. 12, 2017, 7:34 p.m. | #1
On 10/12/2017 10:03 AM, João Chaínho wrote:
> This patch fixes the switch port numbering on Mikrotik RB951Ui-2nD (hAP).
> 
> Signed-off-by: João Chaínho <joaochainho@gmail.com>
> ---
> diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
> index 39e819f..61dd97a 100755
> --- a/target/linux/ar71xx/base-files/etc/board.d/02_network
> +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
> @@ -149,7 +149,6 @@ ar71xx_setup_interfaces()
>  	pb42|\
>  	pb44|\
>  	rb-951ui-2hnd|\
> -	rb-951ui-2nd|\
>  	rb-952ui-5ac2nd|\
>  	routerstation|\
>  	tl-wr710n|\
> @@ -160,7 +159,8 @@ ar71xx_setup_interfaces()
>  		ucidef_set_interfaces_lan_wan "eth1" "eth0"
>  		;;
>  	rb-750-r2|\
> -	rb-750up-r2)
> +	rb-750up-r2|\
> +	rb-951ui-2nd)
>  		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
>  		ucidef_add_switch "switch0" \
>  			"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
> @@ -409,9 +409,9 @@ ar71xx_setup_interfaces()
>  	rb-493g)
>  		ucidef_set_interfaces_lan_wan "eth0.1 eth1.1" "eth1.2"
>  		ucidef_add_switch "switch0" \
> -			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
> +			"0@eth0" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3"
>  		ucidef_add_switch "switch1" \
> -			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
> +			"0@eth1" "1:lan:4" "2:lan:1" "3:lan:3" "4:lan:2" "5:wan"
>  		;;

This change looks unrelated to the other change to me and is not
described in the commit message.

>  	tellstick-znet-lite)
>  		ucidef_set_interface_wan "eth0"
João Chaínho Oct. 12, 2017, 9:38 p.m. | #2
Hi Hauke,

Sorry, I forgot that I had also fixed the switch config on Mikrotik RB493G ;)
Should I resubmit the patch with an appropriate title (Fix switch port numbering on RB951Ui-2nD and RB493G)?

> On 12 Oct 2017, at 20:34, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> 
> On 10/12/2017 10:03 AM, João Chaínho wrote:
>> This patch fixes the switch port numbering on Mikrotik RB951Ui-2nD (hAP).
>> 
>> Signed-off-by: João Chaínho <joaochainho@gmail.com>
>> ---
>> diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
>> index 39e819f..61dd97a 100755
>> --- a/target/linux/ar71xx/base-files/etc/board.d/02_network
>> +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
>> @@ -149,7 +149,6 @@ ar71xx_setup_interfaces()
>> 	pb42|\
>> 	pb44|\
>> 	rb-951ui-2hnd|\
>> -	rb-951ui-2nd|\
>> 	rb-952ui-5ac2nd|\
>> 	routerstation|\
>> 	tl-wr710n|\
>> @@ -160,7 +159,8 @@ ar71xx_setup_interfaces()
>> 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
>> 		;;
>> 	rb-750-r2|\
>> -	rb-750up-r2)
>> +	rb-750up-r2|\
>> +	rb-951ui-2nd)
>> 		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
>> 		ucidef_add_switch "switch0" \
>> 			"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
>> @@ -409,9 +409,9 @@ ar71xx_setup_interfaces()
>> 	rb-493g)
>> 		ucidef_set_interfaces_lan_wan "eth0.1 eth1.1" "eth1.2"
>> 		ucidef_add_switch "switch0" \
>> -			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
>> +			"0@eth0" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3"
>> 		ucidef_add_switch "switch1" \
>> -			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
>> +			"0@eth1" "1:lan:4" "2:lan:1" "3:lan:3" "4:lan:2" "5:wan"
>> 		;;
> 
> This change looks unrelated to the other change to me and is not
> described in the commit message.
> 
>> 	tellstick-znet-lite)
>> 		ucidef_set_interface_wan "eth0"

Patch

diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index 39e819f..61dd97a 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -149,7 +149,6 @@  ar71xx_setup_interfaces()
 	pb42|\
 	pb44|\
 	rb-951ui-2hnd|\
-	rb-951ui-2nd|\
 	rb-952ui-5ac2nd|\
 	routerstation|\
 	tl-wr710n|\
@@ -160,7 +159,8 @@  ar71xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
 	rb-750-r2|\
-	rb-750up-r2)
+	rb-750up-r2|\
+	rb-951ui-2nd)
 		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
 		ucidef_add_switch "switch0" \
 			"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
@@ -409,9 +409,9 @@  ar71xx_setup_interfaces()
 	rb-493g)
 		ucidef_set_interfaces_lan_wan "eth0.1 eth1.1" "eth1.2"
 		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
+			"0@eth0" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3"
 		ucidef_add_switch "switch1" \
-			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
+			"0@eth1" "1:lan:4" "2:lan:1" "3:lan:3" "4:lan:2" "5:wan"
 		;;
 	tellstick-znet-lite)
 		ucidef_set_interface_wan "eth0"