ixp400-eth: correct the maclist handling in 1.5

diff --git a/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch b/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch
index 1845dd3..471967f 100644 (file)
--- a/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch
+++ b/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch
@@ -109,7 +109,7 @@
 +    /* fix dev_max_count to maclist_count - the actual number of
 +     * available MACs
 +     */
-+    if (dev_max_count <= 0)
++    if (dev_max_count <= 0 || (dev_max_count > maclist_count() && maclist_count() > 0))
 +          dev_max_count = maclist_count();
 +    if (dev_max_count <= 0)
 +          dev_max_count = 1;

diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb
index c145802..8833b85 100644 (file)
--- a/packages/ixp425-eth/ixp400-eth_1.5.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.bb
@@ -4,6 +4,10 @@
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "GPL"
+PR = "r7"
+
+DEPENDS = "ixp4xx-csr"
+RDEPENDS = "ixp4xx-csr"
 
 SRC_URI = "ftp://aiedownload.intel.com/df-support/9519/eng/GPL_ixp400LinuxEthernetDriverPatch-1_5.zip"
 SRC_URI += "file://2.6.14.patch;patch=1"
@@ -20,11 +24,6 @@ SRC_URI += "file://debug.patch;patch=1"
 SRC_URI += "file://Makefile.patch;patch=1"
 SRC_URI += "file://modprobe.conf"
 
-PR = "r6"
-
-DEPENDS = "ixp4xx-csr"
-RDEPENDS = "ixp4xx-csr"
-
 S = "${WORKDIR}"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"