chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: move the connection to the bus out of manager_new (again)
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index f4ab97fb179feb00735324401960f474d6c8f979..eff1ce94be9bb5273bfd2ec67dc63e598dd4ce95 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-35,7
+35,7
@@
#include "conf-parser.h"
#include "dhcp-lease-internal.h"
#include "conf-parser.h"
#include "dhcp-lease-internal.h"
-
static
bool link_dhcp6_enabled(Link *link) {
+bool link_dhcp6_enabled(Link *link) {
if (link->flags & IFF_LOOPBACK)
return false;
if (link->flags & IFF_LOOPBACK)
return false;
@@
-45,7
+45,7
@@
static bool link_dhcp6_enabled(Link *link) {
return IN_SET(link->network->dhcp, ADDRESS_FAMILY_IPV6, ADDRESS_FAMILY_YES);
}
return IN_SET(link->network->dhcp, ADDRESS_FAMILY_IPV6, ADDRESS_FAMILY_YES);
}
-
static
bool link_dhcp4_enabled(Link *link) {
+bool link_dhcp4_enabled(Link *link) {
if (link->flags & IFF_LOOPBACK)
return false;
if (link->flags & IFF_LOOPBACK)
return false;
@@
-55,7
+55,7
@@
static bool link_dhcp4_enabled(Link *link) {
return IN_SET(link->network->dhcp, ADDRESS_FAMILY_IPV4, ADDRESS_FAMILY_YES);
}
return IN_SET(link->network->dhcp, ADDRESS_FAMILY_IPV4, ADDRESS_FAMILY_YES);
}
-
static
bool link_dhcp4_server_enabled(Link *link) {
+bool link_dhcp4_server_enabled(Link *link) {
if (link->flags & IFF_LOOPBACK)
return false;
if (link->flags & IFF_LOOPBACK)
return false;
@@
-65,7
+65,7
@@
static bool link_dhcp4_server_enabled(Link *link) {
return link->network->dhcp_server;
}
return link->network->dhcp_server;
}
-
static
bool link_ipv4ll_enabled(Link *link) {
+bool link_ipv4ll_enabled(Link *link) {
if (link->flags & IFF_LOOPBACK)
return false;
if (link->flags & IFF_LOOPBACK)
return false;
@@
-75,7
+75,7
@@
static bool link_ipv4ll_enabled(Link *link) {
return link->network->ipv4ll;
}
return link->network->ipv4ll;
}
-
static
bool link_lldp_enabled(Link *link) {
+bool link_lldp_enabled(Link *link) {
if (link->flags & IFF_LOOPBACK)
return false;
if (link->flags & IFF_LOOPBACK)
return false;
@@
-283,12
+283,10
@@
static void link_free(Link *link) {
sd_dhcp_client_unref(link->dhcp_client);
sd_dhcp_lease_unref(link->dhcp_lease);
sd_dhcp_client_unref(link->dhcp_client);
sd_dhcp_lease_unref(link->dhcp_lease);
- unlink(link->lease_file);
free(link->lease_file);
sd_lldp_free(link->lldp);
free(link->lease_file);
sd_lldp_free(link->lldp);
- unlink(link->lldp_file);
free(link->lldp_file);
sd_ipv4ll_unref(link->ipv4ll);
free(link->lldp_file);
sd_ipv4ll_unref(link->ipv4ll);
@@
-300,7
+298,6
@@
static void link_free(Link *link) {
free(link->ifname);
free(link->ifname);
- unlink(link->state_file);
free(link->state_file);
udev_device_unref(link->udev_device);
free(link->state_file);
udev_device_unref(link->udev_device);