chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: message_open_container - don't take a 'size' argument
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index 5e763069f3622367e430a662c62a9cac45fc3f4f..d83c4cef8bf5f4db5263bc0fa1fedb7ebb368ab4 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-426,7
+426,7
@@
static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
}
static int link_set_mtu(Link *link, uint32_t mtu) {
}
static int link_set_mtu(Link *link, uint32_t mtu) {
- _cleanup_
sd_
rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
assert(link);
int r;
assert(link);
@@
-435,7
+435,7
@@
static int link_set_mtu(Link *link, uint32_t mtu) {
log_debug_link(link, "setting MTU: %" PRIu32, mtu);
log_debug_link(link, "setting MTU: %" PRIu32, mtu);
- r = sd_rtnl_message_
link_new
(RTM_SETLINK, link->ifindex, &req);
+ r = sd_rtnl_message_
new_link
(RTM_SETLINK, link->ifindex, &req);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
@@
-783,7
+783,7
@@
static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
}
static int link_up(Link *link) {
}
static int link_up(Link *link) {
- _cleanup_
sd_
rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
assert(link);
int r;
assert(link);
@@
-792,7
+792,7
@@
static int link_up(Link *link) {
log_debug_link(link, "bringing link up");
log_debug_link(link, "bringing link up");
- r = sd_rtnl_message_
link_new
(RTM_SETLINK, link->ifindex, &req);
+ r = sd_rtnl_message_
new_link
(RTM_SETLINK, link->ifindex, &req);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
@@
-876,7
+876,8
@@
static int link_enter_enslave(Link *link) {
link->state = LINK_STATE_ENSLAVING;
link->state = LINK_STATE_ENSLAVING;
- if (!link->network->bridge && !link->network->bond && !link->network->vlans)
+ if (!link->network->bridge && !link->network->bond &&
+ hashmap_isempty(link->network->vlans))
return link_enslaved(link);
if (link->network->bridge) {
return link_enslaved(link);
if (link->network->bridge) {
@@
-949,7
+950,7
@@
static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
}
static int link_get(Link *link) {
}
static int link_get(Link *link) {
- _cleanup_
sd_
rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
assert(link);
int r;
assert(link);
@@
-958,7
+959,7
@@
static int link_get(Link *link) {
log_debug_link(link, "requesting link status");
log_debug_link(link, "requesting link status");
- r = sd_rtnl_message_
link_new
(RTM_GETLINK, link->ifindex, &req);
+ r = sd_rtnl_message_
new_link
(RTM_GETLINK, link->ifindex, &req);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_GETLINK message");
return r;
if (r < 0) {
log_error_link(link, "Could not allocate RTM_GETLINK message");
return r;