summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-02-21 22:29:25 +0100
committerTom Gundersen <teg@jklm.no>2014-02-21 22:59:29 +0100
commitbf175aafd20c9ef974709ef12c5acf836121af33 (patch)
tree47262edca73fc2ea2107185eb1a45066c426ca61 /src/network
parent95f41b729855bdc9788bec87ab25e54e25ca8a5f (diff)
net-util: match on the driver as exposed by ethtool if DRIVER not set
Also fix a copy-paste error that broke matching on interface name.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-netdev.c2
-rw-r--r--src/network/networkd-network.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index c3bda6da84..05f21fa874 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -366,7 +366,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
if (net_match_config(NULL, NULL, NULL, NULL, NULL,
netdev->match_host, netdev->match_virt,
netdev->match_kernel, netdev->match_arch,
- NULL, NULL, NULL, NULL, NULL) <= 0)
+ NULL, NULL, NULL, NULL, NULL, NULL) <= 0)
return 0;
r = hashmap_put(netdev->manager->netdevs, netdev->name, netdev);
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 2e68bec2e7..14fa92aeaf 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -181,6 +181,7 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) {
udev_device_get_sysattr_value(device, "address"),
udev_device_get_property_value(device, "ID_PATH"),
udev_device_get_driver(udev_device_get_parent(device)),
+ udev_device_get_property_value(device, "ID_NET_DRIVER"),
udev_device_get_devtype(device),
udev_device_get_sysname(device))) {
log_debug("%s: found matching network '%s'",