shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

Merge pull request #4150 from ssahani/net1

Browse Source 
networkd: trivial fixes
This commit is contained in:
Martin Pitt 2016-09-15 12:20:09 +02:00 committed by GitHub
commit bfa91d65bb
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -801,7 +801,6 @@ Features:
- add reduced [Link] support to .network files - add reduced [Link] support to .network files
- add Scope= parsing option for [Network] - add Scope= parsing option for [Network]
- properly handle routerless dhcp leases - properly handle routerless dhcp leases
- add more attribute support for SIT tunnel
- work with non-Ethernet devices - work with non-Ethernet devices
- add support for more bond options - add support for more bond options
- dhcp: do we allow configuring dhcp routes on interfaces that are not the one we got the dhcp info from? - dhcp: do we allow configuring dhcp routes on interfaces that are not the one we got the dhcp info from?
@ -818,7 +817,6 @@ Features:
support Name=foo*|bar*|baz ? support Name=foo*|bar*|baz ?
- duplicate address check for static IPs (like ARPCHECK in network-scripts) - duplicate address check for static IPs (like ARPCHECK in network-scripts)
- allow DUID/IAID to be customized, see issue #394. - allow DUID/IAID to be customized, see issue #394.
- support configuration option for TSO (tcp segmentation offload)
- whenever uplink info changes, make DHCP server send out FORCERENEW - whenever uplink info changes, make DHCP server send out FORCERENEW
* networkd-wait-online: * networkd-wait-online:

3
src/network/networkd-netdev.c
View File

@ -34,7 +34,6 @@
#include "string-util.h" #include "string-util.h"
const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = { const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
[NETDEV_KIND_BRIDGE] = &bridge_vtable, [NETDEV_KIND_BRIDGE] = &bridge_vtable,
[NETDEV_KIND_BOND] = &bond_vtable, [NETDEV_KIND_BOND] = &bond_vtable,
[NETDEV_KIND_VLAN] = &vlan_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); r = sd_netlink_message_close_container(m);
if (r < 0) 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); r = sd_netlink_message_close_container(m);
if (r < 0) if (r < 0)

2
src/network/networkd-network.c
View File

@ -482,7 +482,7 @@ int config_parse_netdev(const char *unit,
case NETDEV_KIND_VCAN: case NETDEV_KIND_VCAN:
r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev); r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev);
if (r < 0) { 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; return 0;
} }