From: Zhenhua Luo <zhenhua.luo@freescale.com>
Date: Thu, 27 Jun 2013 09:24:58 +0000 (+0000)
Subject: udev-extraconf: fix the name conflict of macless and PCIe Ethernet port in slot3
X-Git-Tag: 2.1~534^2~272
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=eff0c46ac917430cfdfa0007b752b9eef26e7ea3;p=meta-freescale.git

udev-extraconf: fix the name conflict of macless and PCIe Ethernet port in slot3

Currently both macless0 port and PCIe Ethernet port in slot3 use "eth2",
update udev rules to rename macless0 to eth4.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---

diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
index 50bc4462..9bd67858 100644
--- a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
+++ b/meta-fsl-ppc/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
@@ -16,8 +16,11 @@ SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5f0000", NAME="fm2-
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ff7e0000", NAME="fm1-gb0"
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ff7e2000", NAME="fm1-gb1"
 
-# Unify the PCIe Etherenet port -maxinum PCIe slots is 4
+# Unify the PCIe Etherenet port, maxinum PCIe slots is 4
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe200000.pcie", DRIVERS=="fsl-pci", NAME="eth0"
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe201000.pcie", DRIVERS=="fsl-pci", NAME="eth1"
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe202000.pcie", DRIVERS=="fsl-pci", NAME="eth2"
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe203000.pcie", DRIVERS=="fsl-pci", NAME="eth3"
+
+# Rename macless0 port to "eth4"
+SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="eth4"
diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules
index cfc2853e..3529bc41 100644
--- a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules
+++ b/meta-fsl-ppc/recipes-core/udev/udev-extraconf/72-fsl-dpaa-persistent-networking.rules
@@ -20,8 +20,11 @@ SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5ee000", NAME="fm2-
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5f0000", NAME="fm2-mac9"
 SUBSYSTEM=="net", DRIVERS=="fsl_dpa", ATTR{device_addr}=="ffe5f2000", NAME="fm2-mac10"
 
-# Unify the PCIe Etherenet port -maxinum PCIe slots is 4
+# Unify the PCIe Etherenet port, maxinum PCIe slots is 4
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe240000.pcie", DRIVERS=="fsl-pci", NAME="eth0"
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe250000.pcie", DRIVERS=="fsl-pci", NAME="eth1"
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe260000.pcie", DRIVERS=="fsl-pci", NAME="eth2"
 SUBSYSTEM=="net", KERNEL=="eth*", KERNELS=="ffe270000.pcie", DRIVERS=="fsl-pci", NAME="eth3"
+
+# Rename macless0 to "eth4"
+SUBSYSTEM=="net", ATTR{device_type}=="macless0", NAME="eth4"