Blame SOURCES/0012-code-clean-up-only-set-businfo-or-modalias-when-it-s.patch
|
 |
21ef37 |
From b314f4ffa28980ffcadb7eecb0c2b0def6e11c49 Mon Sep 17 00:00:00 2001
|
|
|
21ef37 |
From: Lyonel Vincent <lyonel@ezix.org>
|
|
|
21ef37 |
Date: Wed, 17 Aug 2016 00:05:17 +0200
|
|
|
21ef37 |
Subject: [PATCH 12/43] code clean-up: only set businfo or modalias when it's
|
|
|
21ef37 |
known
|
|
|
21ef37 |
|
|
|
21ef37 |
---
|
|
|
21ef37 |
src/core/network.cc | 7 +++++--
|
|
|
21ef37 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
21ef37 |
|
|
|
21ef37 |
diff --git a/src/core/network.cc b/src/core/network.cc
|
|
|
21ef37 |
index 77233fc..1d54959 100644
|
|
|
21ef37 |
--- a/src/core/network.cc
|
|
|
21ef37 |
+++ b/src/core/network.cc
|
|
|
21ef37 |
@@ -336,8 +336,11 @@ bool scan_network(hwNode & n)
|
|
|
21ef37 |
interface.addHint("icon", string("network"));
|
|
|
21ef37 |
|
|
|
21ef37 |
string businfo = sysfs::entry::byClass("net", interface.getLogicalName()).businfo();
|
|
|
21ef37 |
- interface.setBusInfo(businfo);
|
|
|
21ef37 |
- interface.setConfig("modalias", sysfs::entry::byClass("net", interface.getLogicalName()).modalias());
|
|
|
21ef37 |
+ if (businfo!="")
|
|
|
21ef37 |
+ interface.setBusInfo(businfo);
|
|
|
21ef37 |
+ string modalias = sysfs::entry::byClass("net", interface.getLogicalName()).modalias();
|
|
|
21ef37 |
+ if (modalias!="")
|
|
|
21ef37 |
+ interface.setConfig("modalias", modalias);
|
|
|
21ef37 |
|
|
|
21ef37 |
//scan_mii(fd, interface);
|
|
|
21ef37 |
scan_ip(interface);
|
|
|
21ef37 |
--
|
|
|
21ef37 |
2.10.2
|
|
|
21ef37 |
|