Blame SOURCES/0003-Display-proper-logical-name-of-network-device.patch

df7b7f
From 85edb6a1a5734078a58bad21a5e6918e07f360bc Mon Sep 17 00:00:00 2001
df7b7f
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
df7b7f
Date: Tue, 30 Apr 2019 17:24:50 +0530
df7b7f
Subject: [PATCH] Display proper logical name of network device
df7b7f
df7b7f
This patch adds support to display proper logical name of
df7b7f
network devices.
df7b7f
df7b7f
Test results:
df7b7f
df7b7f
  *-l-lan
df7b7f
       description: Ethernet interface
df7b7f
       physical id: 2
df7b7f
       bus info: vio@30000002
df7b7f
       logical name: /proc/device-tree/vdevice/l-lan@30000002
df7b7f
df7b7f
With patch:
df7b7f
df7b7f
  *-l-lan
df7b7f
       description: Ethernet interface
df7b7f
       physical id: 2
df7b7f
       bus info: vio@30000002
df7b7f
       logical name: /proc/device-tree/vdevice/l-lan@30000002
df7b7f
       logical name: eth0
df7b7f
df7b7f
Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
df7b7f
Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
df7b7f
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
df7b7f
---
df7b7f
 src/core/hw.cc | 4 ++--
df7b7f
 1 file changed, 2 insertions(+), 2 deletions(-)
df7b7f
df7b7f
diff --git a/src/core/hw.cc b/src/core/hw.cc
df7b7f
index f136383e99fb..4522c1af0fc3 100644
df7b7f
--- a/src/core/hw.cc
df7b7f
+++ b/src/core/hw.cc
df7b7f
@@ -1284,8 +1284,8 @@ void hwNode::merge(const hwNode & node)
df7b7f
     This->handle = node.getHandle();
df7b7f
   if (This->description == "")
df7b7f
     This->description = node.getDescription();
df7b7f
-  if (This->logicalnames.size() == 0)
df7b7f
-    This->logicalnames = node.getLogicalNames();
df7b7f
+  for (unsigned int i = 0; i < node.This->logicalnames.size(); i++)
df7b7f
+    setLogicalName(node.This->logicalnames[i]);
df7b7f
   if (This->businfo == "")
df7b7f
     This->businfo = node.getBusInfo();
df7b7f
   if (This->physid == "")
df7b7f
-- 
df7b7f
2.17.1
df7b7f