summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-09-15 12:20:09 +0200
committerGitHub <noreply@github.com>2016-09-15 12:20:09 +0200
commitbfa91d65bbb6c0b39facb9f8a72e497b1b938340 (patch)
treeca1dd229b504bc1342cdceb8b613b7aea5f8232b /src
parentd903a89246f40b6527e2358498657a9a3c625237 (diff)
parenta4820c463acd3777268bf6eb25284f7dab898187 (diff)
Merge pull request #4150 from ssahani/net1
networkd: trivial fixes
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-netdev.c3
-rw-r--r--src/network/networkd-network.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 583389c8dd..897de9bde5 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -34,7 +34,6 @@
#include "string-util.h"
const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
-
[NETDEV_KIND_BRIDGE] = &bridge_vtable,
[NETDEV_KIND_BOND] = &bond_vtable,
[NETDEV_KIND_VLAN] = &vlan_vtable,
@@ -516,7 +515,7 @@ static int netdev_create(NetDev *netdev, Link *link,
r = sd_netlink_message_close_container(m);
if (r < 0)
- return log_netdev_error_errno(netdev, r, "Could not append IFLA_LINKINFO attribute: %m");
+ return log_netdev_error_errno(netdev, r, "Could not append IFLA_INFO_DATA attribute: %m");
r = sd_netlink_message_close_container(m);
if (r < 0)
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 9865c8a5c0..91e51e9124 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -482,7 +482,7 @@ int config_parse_netdev(const char *unit,
case NETDEV_KIND_VCAN:
r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev);
if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, r, "Can not add VLAN '%s' to network: %m", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, r, "Can not add NetDev '%s' to network: %m", rvalue);
return 0;
}