Archer C25: Fix disabling 5 GHz

Submitted by Adrian Schmutzler on Oct. 14, 2017, 11:09 a.m.

Details

Message ID 1507979388-1212-1-git-send-email-freifunk@adrianschmutzler.de
State Rejected
Headers show

Commit Message

Adrian Schmutzler Oct. 14, 2017, 11:09 a.m. 
Since WiFi phy adapters are deleted and recreated, the initial
workaround to disable 5 GHz is not working anymore. We thus
disable 5 GHz on any creation of the relevant adapter.

APPLY ONLY AFTER CHANNEL PATCH!

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-network/ar71xx/network.archer-c25-v1      | 3 ---
 src/packages/fff/fff-wireless/files/lib/functions/fff/wireless | 9 +++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
index 1d58c9c..d7b95a1 100644
--- a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
+++ b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
@@ -8,6 +8,3 @@  BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=eth1
 ROUTERMAC=eth0
-
-uci -q set "wireless.radio0.disabled=1"
-uci -q commit wireless
diff --git a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
index 5c93690..4731179 100644
--- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
+++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
@@ -25,11 +25,14 @@  wifiAddPhy() {
 	local channel=$2
 	local radio="radio$(echo "$phy" | tr -d -C "0-9")"
 	local hwmode="11g"
+	local frq="2"
 	if [ "$channel" = "auto5" ] ; then
 		hwmode="11a"
 		channel="auto"
+		frq="5"
 	elif ( ! [ "$channel" = "auto" ] ) && [ "$channel" -gt "14" ]; then
 		hwmode="11a"
+		frq="5"
 	fi
 
 	uci batch <<-__EOF__
@@ -49,6 +52,12 @@  wifiAddPhy() {
 	fi
 	uci commit wireless
 
+	BOARD="$(uci -q get board.model.name)"
+	if [ "$frq" = "5" ] && [ "$BOARD" = "archer-c25-v1" ] ; then
+		uci -q set "wireless.${radio}.disabled=1"
+		uci -q commit wireless
+	fi
+
 	echo "${radio}"
 	return 0
 }

Comments

Tim Niemeyer Oct. 14, 2017, 1:55 p.m. 
Hi Adrian

Mir gefällt die Vermischung von Geräte-Daten und Code nicht.

Wenn der ath10k wirklich solche Probleme macht, dann sollten wir
überlegen, ob wir diesen Treiber vielleicht kicken.

Tim

Am Samstag, den 14.10.2017, 13:09 +0200 schrieb Adrian Schmutzler:
> Since WiFi phy adapters are deleted and recreated, the initial
> workaround to disable 5 GHz is not working anymore. We thus
> disable 5 GHz on any creation of the relevant adapter.
> 
> APPLY ONLY AFTER CHANNEL PATCH!
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  src/packages/fff/fff-network/ar71xx/network.archer-c25-v1      | 3
> ---
>  src/packages/fff/fff-wireless/files/lib/functions/fff/wireless | 9
> +++++++++
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c25-
> v1 b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
> index 1d58c9c..d7b95a1 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
> @@ -8,6 +8,3 @@ BATMAN_PORTS="3 4 0t"
>  
>  ETHMESHMAC=eth1
>  ROUTERMAC=eth0
> -
> -uci -q set "wireless.radio0.disabled=1"
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-
> wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-
> wireless/files/lib/functions/fff/wireless
> index 5c93690..4731179 100644
> --- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
> +++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
> @@ -25,11 +25,14 @@ wifiAddPhy() {
>  	local channel=$2
>  	local radio="radio$(echo "$phy" | tr -d -C "0-9")"
>  	local hwmode="11g"
> +	local frq="2"
>  	if [ "$channel" = "auto5" ] ; then
>  		hwmode="11a"
>  		channel="auto"
> +		frq="5"
>  	elif ( ! [ "$channel" = "auto" ] ) && [ "$channel" -gt "14"
> ]; then
>  		hwmode="11a"
> +		frq="5"
>  	fi
>  
>  	uci batch <<-__EOF__
> @@ -49,6 +52,12 @@ wifiAddPhy() {
>  	fi
>  	uci commit wireless
>  
> +	BOARD="$(uci -q get board.model.name)"
> +	if [ "$frq" = "5" ] && [ "$BOARD" = "archer-c25-v1" ] ; then
> +		uci -q set "wireless.${radio}.disabled=1"
> +		uci -q commit wireless
> +	fi
> +
>  	echo "${radio}"
>  	return 0
>  }
> -- 
> 2.7.4
>
Fabian Blaese Oct. 19, 2017, 10:16 p.m. 
Ist das eigentlich inzwischen obsolet?
Bei Christian funktioniert der C25 scheinbar wunderbar. Hat noch jemand außer Adrian und Christian so einen C25? Vielleicht sollte diesbezüglich vor allem 5GHz Meshing mal getestet werden.

Fabian

> On 14. Oct 2017, at 15:55, Tim Niemeyer <tim@tn-x.org> wrote:
> 
> Hi Adrian
> 
> Mir gefällt die Vermischung von Geräte-Daten und Code nicht.
> 
> Wenn der ath10k wirklich solche Probleme macht, dann sollten wir
> überlegen, ob wir diesen Treiber vielleicht kicken.
> 
> Tim
> 
> Am Samstag, den 14.10.2017, 13:09 +0200 schrieb Adrian Schmutzler:
>> Since WiFi phy adapters are deleted and recreated, the initial
>> workaround to disable 5 GHz is not working anymore. We thus
>> disable 5 GHz on any creation of the relevant adapter.
>> 
>> APPLY ONLY AFTER CHANNEL PATCH!
>> 
>> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
>> ---
>>  src/packages/fff/fff-network/ar71xx/network.archer-c25-v1      | 3
>> ---
>>  src/packages/fff/fff-wireless/files/lib/functions/fff/wireless | 9
>> +++++++++
>>  2 files changed, 9 insertions(+), 3 deletions(-)
>> 
>> diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c25-
>> v1 b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
>> index 1d58c9c..d7b95a1 100644
>> --- a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
>> +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
>> @@ -8,6 +8,3 @@ BATMAN_PORTS="3 4 0t"
>> 
>>  ETHMESHMAC=eth1
>>  ROUTERMAC=eth0
>> -
>> -uci -q set "wireless.radio0.disabled=1"
>> -uci -q commit wireless
>> diff --git a/src/packages/fff/fff-
>> wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-
>> wireless/files/lib/functions/fff/wireless
>> index 5c93690..4731179 100644
>> --- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
>> +++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
>> @@ -25,11 +25,14 @@ wifiAddPhy() {
>>  	local channel=$2
>>  	local radio="radio$(echo "$phy" | tr -d -C "0-9")"
>>  	local hwmode="11g"
>> +	local frq="2"
>>  	if [ "$channel" = "auto5" ] ; then
>>  		hwmode="11a"
>>  		channel="auto"
>> +		frq="5"
>>  	elif ( ! [ "$channel" = "auto" ] ) && [ "$channel" -gt "14"
>> ]; then
>>  		hwmode="11a"
>> +		frq="5"
>>  	fi
>> 
>>  	uci batch <<-__EOF__
>> @@ -49,6 +52,12 @@ wifiAddPhy() {
>>  	fi
>>  	uci commit wireless
>> 
>> +	BOARD="$(uci -q get board.model.name)"
>> +	if [ "$frq" = "5" ] && [ "$BOARD" = "archer-c25-v1" ] ; then
>> +		uci -q set "wireless.${radio}.disabled=1"
>> +		uci -q commit wireless
>> +	fi
>> +
>>  	echo "${radio}"
>>  	return 0
>>  }
>> --
>> 2.7.4
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Adrian Schmutzler Oct. 19, 2017, 10:27 p.m. 
Das war eine Idee, um 5 GHz doch deaktivieren zu können. Weil bei mir ist das immer noch Krieg ...

> -----Original Message-----
> From: Fabian Bläse [mailto:fabian@blaese.de]
> Sent: Freitag, 20. Oktober 2017 00:16
> To: Tim Niemeyer <tim@tn-x.org>; franken-dev@freifunk.net
> Cc: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> Subject: Re: [PATCH] Archer C25: Fix disabling 5 GHz
> 
> Ist das eigentlich inzwischen obsolet?
> Bei Christian funktioniert der C25 scheinbar wunderbar. Hat noch jemand
> außer Adrian und Christian so einen C25? Vielleicht sollte diesbezüglich vor
> allem 5GHz Meshing mal getestet werden.
> 
> Fabian
> 
> > On 14. Oct 2017, at 15:55, Tim Niemeyer <tim@tn-x.org> wrote:
> >
> > Hi Adrian
> >
> > Mir gefällt die Vermischung von Geräte-Daten und Code nicht.
> >
> > Wenn der ath10k wirklich solche Probleme macht, dann sollten wir
> > überlegen, ob wir diesen Treiber vielleicht kicken.
> >
> > Tim
> >
> > Am Samstag, den 14.10.2017, 13:09 +0200 schrieb Adrian Schmutzler:
> >> Since WiFi phy adapters are deleted and recreated, the initial
> >> workaround to disable 5 GHz is not working anymore. We thus disable 5
> >> GHz on any creation of the relevant adapter.
> >>
> >> APPLY ONLY AFTER CHANNEL PATCH!
> >>
> >> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> >> ---
> >>  src/packages/fff/fff-network/ar71xx/network.archer-c25-v1      | 3
> >> ---
> >>  src/packages/fff/fff-wireless/files/lib/functions/fff/wireless | 9
> >> +++++++++
> >>  2 files changed, 9 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c25-
> >> v1 b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
> >> index 1d58c9c..d7b95a1 100644
> >> --- a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
> >> +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1
> >> @@ -8,6 +8,3 @@ BATMAN_PORTS="3 4 0t"
> >>
> >>  ETHMESHMAC=eth1
> >>  ROUTERMAC=eth0
> >> -
> >> -uci -q set "wireless.radio0.disabled=1"
> >> -uci -q commit wireless
> >> diff --git a/src/packages/fff/fff-
> >> wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-
> >> wireless/files/lib/functions/fff/wireless
> >> index 5c93690..4731179 100644
> >> --- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
> >> +++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
> >> @@ -25,11 +25,14 @@ wifiAddPhy() {
> >>  	local channel=$2
> >>  	local radio="radio$(echo "$phy" | tr -d -C "0-9")"
> >>  	local hwmode="11g"
> >> +	local frq="2"
> >>  	if [ "$channel" = "auto5" ] ; then
> >>  		hwmode="11a"
> >>  		channel="auto"
> >> +		frq="5"
> >>  	elif ( ! [ "$channel" = "auto" ] ) && [ "$channel" -gt "14"
> >> ]; then
> >>  		hwmode="11a"
> >> +		frq="5"
> >>  	fi
> >>
> >>  	uci batch <<-__EOF__
> >> @@ -49,6 +52,12 @@ wifiAddPhy() {
> >>  	fi
> >>  	uci commit wireless
> >>
> >> +	BOARD="$(uci -q get board.model.name)"
> >> +	if [ "$frq" = "5" ] && [ "$BOARD" = "archer-c25-v1" ] ; then
> >> +		uci -q set "wireless.${radio}.disabled=1"
> >> +		uci -q commit wireless
> >> +	fi
> >> +
> >>  	echo "${radio}"
> >>  	return 0
> >>  }
> >> --
> >> 2.7.4
> > --
> > franken-dev mailing list
> > franken-dev@freifunk.net
> > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net