| Message ID | 1449514747-31702-1-git-send-email-a.heider@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi, On 07/12/2015 19:59, Andre Heider wrote: > Since r43114 adsl will be used if annex is specified, so don't. if r43114 changed the default behaviour then we need to fix r43114 rather than hide the regression by deleting code. John > --- > > v2: rebased > > target/linux/lantiq/base-files/etc/board.d/02_network | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network > index 08a143f..00ebb62 100755 > --- a/target/linux/lantiq/base-files/etc/board.d/02_network > +++ b/target/linux/lantiq/base-files/etc/board.d/02_network > @@ -136,7 +136,7 @@ if [ -n "$(ls /lib/modules/`uname -r`/ltq_atm*)" ]; then > fi > > if [ -n "$(grep "system type.*: VR9" /proc/cpuinfo)" ]; then > - ucidef_add_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm" > + ucidef_add_vdsl_modem "" "/lib/firmware/vdsl.bin" "av" "ptm" > else > ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" > fi >
Hi, sorry, missed that one since I wasn't CC'ed. On Fri, Dec 11, 2015 at 10:37 AM, John Crispin <blogic@openwrt.org> wrote: > On 07/12/2015 19:59, Andre Heider wrote: >> Since r43114 adsl will be used if annex is specified, so don't. > > if r43114 changed the default behaviour then we need to fix r43114 > rather than hide the regression by deleting code. Hm, but is that really a regression? There is no annex settings in vdsl, the current behavior is just to use vdsl if the uci annex setting is empty. Sounds okay to me. Sure, it could be done another way, but still, setting annex to 'a' while using a vdsl firmware doesn't make sense. Regards, Andre
diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network index 08a143f..00ebb62 100755 --- a/target/linux/lantiq/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/base-files/etc/board.d/02_network @@ -136,7 +136,7 @@ if [ -n "$(ls /lib/modules/`uname -r`/ltq_atm*)" ]; then fi if [ -n "$(grep "system type.*: VR9" /proc/cpuinfo)" ]; then - ucidef_add_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm" + ucidef_add_vdsl_modem "" "/lib/firmware/vdsl.bin" "av" "ptm" else ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" fi