diff mbox

[OpenWrt-Devel,3/3] package/network/config/qos-scripts: Drop ifconfig and use ip command instead

Message ID 1453317725-93230-3-git-send-email-openwrt@daniel.thecshore.com
State Changes Requested
Delegated to: Felix Fietkau
Headers show

Commit Message

Daniel Dickinson Jan. 20, 2016, 7:22 p.m. UTC
From: Daniel Dickinson <openwrt@daniel.thecshore.com>

This is the final package in base that depends on ifconfig, so
remove the the dependency on ifconfig and replace ifconfig
command with ip command.  After packages there are various
target preinit scripts that need work.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
---
 package/network/config/qos-scripts/files/usr/lib/qos/generate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Felix Fietkau Jan. 21, 2016, 10:28 p.m. UTC | #1
On 2016-01-20 20:22, openwrt@daniel.thecshore.com wrote:
> From: Daniel Dickinson <openwrt@daniel.thecshore.com>
> 
> This is the final package in base that depends on ifconfig, so
> remove the the dependency on ifconfig and replace ifconfig
> command with ip command.  After packages there are various
> target preinit scripts that need work.
> 
> Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
> ---
>  package/network/config/qos-scripts/files/usr/lib/qos/generate.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
> index caa1125..3d48417 100755
> --- a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
> +++ b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
> @@ -321,7 +321,7 @@ start_interface() {
>  			append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate:$qdisc:$filter" "$N"
>  		done
>  		append ${prefix}q "$(tcrules)" "$N"
> -		export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
> +		export dev_${dir}="ip link set $dev up txqueuelen 5 >&- 2>&-
This doesn't actually work...

- Felix
Daniel Dickinson Jan. 21, 2016, 11:33 p.m. UTC | #2
On 21/01/16 05:28 PM, Felix Fietkau wrote:
> On 2016-01-20 20:22, openwrt@daniel.thecshore.com wrote:
>> From: Daniel Dickinson <openwrt@daniel.thecshore.com>
>>
>> This is the final package in base that depends on ifconfig, so
>> remove the the dependency on ifconfig and replace ifconfig
>> command with ip command.  After packages there are various
>> target preinit scripts that need work.
>>
>> Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
>> ---
>>   package/network/config/qos-scripts/files/usr/lib/qos/generate.sh | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
>> index caa1125..3d48417 100755
>> --- a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
>> +++ b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
>> @@ -321,7 +321,7 @@ start_interface() {
>>   			append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate:$qdisc:$filter" "$N"
>>   		done
>>   		append ${prefix}q "$(tcrules)" "$N"
>> -		export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
>> +		export dev_${dir}="ip link set $dev up txqueuelen 5 >&- 2>&-
> This doesn't actually work...

Is it unsupported by busybox ip applet?  It is correct on fedora, but I 
forgot to also add to this one that it's untested on a device (like 
openvpn change, because I haven't had a chance to set up a test bed that 
would allow me to test these two; the netifd udhcpc one works in my 
limited testing, but I don't have upstream classless routes, non Class C 
addresses or such; for that I'd need a better test environment).

Regards,

Daniel
Daniel Dickinson Jan. 22, 2016, 2:41 a.m. UTC | #3
Hi Felix,

On 21/01/16 05:28 PM, Felix Fietkau wrote:
>>   		done
>>   		append ${prefix}q "$(tcrules)" "$N"
>> -		export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
>> +		export dev_${dir}="ip link set $dev up txqueuelen 5 >&- 2>&-
> This doesn't actually work...

I noticed you removed txqueuelen from if the ifconfig on qos-scripts - 
are you saying this comment was not actually in relation to using ip, 
but actually to whoever did the patch that changed ifconfig to use 
txqueuelen?

IOW is this actually a case of I need to make a change to the patch 
because what was in trunk was actually wrong?

Regards,

Daniel
Bastian Bittorf Jan. 22, 2016, 7:06 a.m. UTC | #4
* Daniel Dickinson <openwrt@daniel.thecshore.com> [22.01.2016 07:55]:
> >>-		export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
> >>+		export dev_${dir}="ip link set $dev up txqueuelen 5 >&- 2>&-
> >This doesn't actually work...
> 
> Is it unsupported by busybox ip applet?  It is correct on fedora, but

seems like:

root@box:~ ip link set $WANDEV up txqueuelen 5
ip: either "dev" is duplicate, or "txqueuelen" is garbage

bye, bastian
diff mbox

Patch

diff --git a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
index caa1125..3d48417 100755
--- a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
@@ -321,7 +321,7 @@  start_interface() {
 			append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate:$qdisc:$filter" "$N"
 		done
 		append ${prefix}q "$(tcrules)" "$N"
-		export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
+		export dev_${dir}="ip link set $dev up txqueuelen 5 >&- 2>&-
 tc qdisc del dev $dev root >&- 2>&-
 tc qdisc add dev $dev root handle 1: hfsc default ${class_default}0
 tc class add dev $dev parent 1: classid 1:1 hfsc sc rate ${rate}kbit ul rate ${rate}kbit"