[LEDE-DEV] [PATCH 4/5] lantiq: ltq-xdsl-app: remove ESI settings

[Mathias Kresin]

Now that the ESI is set by br2684ctl we can remove the ESI related stuff
from the ltq-xdsl-apps.

This eliminates a potential MAC address collision, since the esi command
sets always the eth0 mac incremented by one, regardless whether this MAC
address is used by another interface.

Signed-off-by: Mathias Kresin <dev at kresin.me>
---
 package/network/config/ltq-adsl-app/files/dsl_control              | 2 --
 package/network/config/ltq-vdsl-app/Makefile                       | 2 +-
 package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/network/config/ltq-adsl-app/files/dsl_control b/package/network/config/ltq-adsl-app/files/dsl_control
index dcde6b2..8218186 100644
--- a/package/network/config/ltq-adsl-app/files/dsl_control
+++ b/package/network/config/ltq-adsl-app/files/dsl_control
@@ -45,8 +45,6 @@ start() {
 		return 1
 	}
 
-	esi $(printf '%012X' $((1+0x$(tr -d : </sys/class/net/eth0/address))))
-
 	service_start /sbin/dsl_cpe_control -i${xtu} \
 			-n /sbin/dsl_notify.sh \
 			-f ${firmware}
diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile
index 6c2e268..bb906e8 100644
--- a/package/network/config/ltq-vdsl-app/Makefile
+++ b/package/network/config/ltq-vdsl-app/Makefile
@@ -28,7 +28,7 @@ define Package/ltq-vdsl-app
   CATEGORY:=Network
   TITLE:=Lantiq VDSL userland tool
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt +atm-esi
+  DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt
 endef
 
 define Package/ltq-vdsl-app/description
diff --git a/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper b/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper
index cc127f7..8e7c1cb 100644
--- a/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper
+++ b/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper
@@ -7,5 +7,4 @@ for mod in $LOAD; do
 	grep -q "$mod " /proc/modules || insmod "$mod"
 done
 
-esi $(printf '%012X' $((1+0x$(tr -d : </sys/class/net/eth0/address))))
 exec /sbin/vdsl_cpe_control "$@"
-- 
1.9.1