Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 10:32:33 +01:00
Code Releases Activity

netconfig: Use l_dhcp_lease_get_prefix_length

Browse Source
This commit is contained in:
Denis Kenzior 2021-10-13 17:01:51 -05:00
parent 6b71a71e19
commit f1b2bca6bd
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/netconfig.c
View File

@ -549,9 +549,7 @@ static struct l_rtnl_address *netconfig_get_dhcp4_address(
const struct l_dhcp_lease *lease = const struct l_dhcp_lease *lease =
l_dhcp_client_get_lease(netconfig->dhcp_client); l_dhcp_client_get_lease(netconfig->dhcp_client);
L_AUTO_FREE_VAR(char *, ip) = NULL; L_AUTO_FREE_VAR(char *, ip) = NULL;
L_AUTO_FREE_VAR(char *, netmask) = NULL;
L_AUTO_FREE_VAR(char *, broadcast) = NULL; L_AUTO_FREE_VAR(char *, broadcast) = NULL;
struct in_addr in_addr;
uint32_t prefix_len; uint32_t prefix_len;
struct l_rtnl_address *ret; struct l_rtnl_address *ret;
@ -559,12 +557,10 @@ static struct l_rtnl_address *netconfig_get_dhcp4_address(
return NULL; return NULL;
ip = l_dhcp_lease_get_address(lease); ip = l_dhcp_lease_get_address(lease);
netmask = l_dhcp_lease_get_netmask(lease);
broadcast = l_dhcp_lease_get_broadcast(lease); broadcast = l_dhcp_lease_get_broadcast(lease);
if (netmask && inet_pton(AF_INET, netmask, &in_addr) > 0) prefix_len = l_dhcp_lease_get_prefix_length(lease);
prefix_len = __builtin_popcountl(in_addr.s_addr); if (!prefix_len)
else
prefix_len = 24; prefix_len = 24;
ret = l_rtnl_address_new(ip, prefix_len); ret = l_rtnl_address_new(ip, prefix_len);