Merge pull request #21672 from yuwata/network-old-kernel-support
network: old kernel support
This commit is contained in:
@@ -1314,6 +1314,14 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
|
||||
}
|
||||
|
||||
r = sd_netlink_message_read_u32(message, IFA_FLAGS, &tmp->flags);
|
||||
if (r == -ENODATA) {
|
||||
unsigned char flags;
|
||||
|
||||
/* For old kernels. */
|
||||
r = sd_rtnl_message_addr_get_flags(message, &flags);
|
||||
if (r >= 0)
|
||||
tmp->flags = flags;
|
||||
}
|
||||
if (r < 0) {
|
||||
log_link_warning_errno(link, r, "rtnl: received address message without flags, ignoring: %m");
|
||||
return 0;
|
||||
|
||||
@@ -1646,7 +1646,6 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, Ma
|
||||
Link *link = NULL;
|
||||
uint32_t ifindex;
|
||||
uint16_t type;
|
||||
unsigned char table;
|
||||
size_t rta_len;
|
||||
int r;
|
||||
|
||||
@@ -1785,6 +1784,8 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, Ma
|
||||
|
||||
r = sd_netlink_message_read_u32(message, RTA_TABLE, &tmp->table);
|
||||
if (r == -ENODATA) {
|
||||
unsigned char table;
|
||||
|
||||
r = sd_rtnl_message_route_get_table(message, &table);
|
||||
if (r >= 0)
|
||||
tmp->table = table;
|
||||
|
||||
Reference in New Issue
Block a user