Commit 41b46f13 authored by Thomas Haller's avatar Thomas Haller

platform: adjust type of link flags to guint

The type of ifi_flags is unsigned, not uint32_t.
parent 18421e2f
......@@ -4743,7 +4743,6 @@ link_vlan_change (NMPlatform *platform,
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
const NMPObject *obj_cache;
nm_auto_nlmsg struct nl_msg *nlmsg = NULL;
unsigned flags;
const NMPObjectLnkVlan *lnk;
guint new_n_ingress_map = 0;
guint new_n_egress_map = 0;
......@@ -4761,7 +4760,6 @@ link_vlan_change (NMPlatform *platform,
}
lnk = obj_cache->_link.netlink.lnk ? &obj_cache->_link.netlink.lnk->_lnk_vlan : NULL;
flags = obj_cache->link.flags;
flags_set &= flags_mask;
......
......@@ -803,7 +803,7 @@ nm_platform_link_refresh (NMPlatform *self, int ifindex)
return TRUE;
}
static guint32
static guint
_link_get_flags (NMPlatform *self, int ifindex)
{
const NMPlatformLink *pllink;
......
......@@ -147,9 +147,8 @@ struct _NMPlatformLink {
* initialized with memset(0) has and unset value.*/
guint8 inet6_addr_gen_mode_inv;
/* IFF_* flags as u32. Note that ifi_flags in 'struct ifinfomsg' is declared as 'unsigned',
* but libnl stores the flag internally as u32. */
guint32 flags;
/* IFF_* flags. Note that the flags in 'struct ifinfomsg' are declared as 'unsigned'. */
guint flags;
/* @connected is mostly identical to (@flags & IFF_UP). Except for bridge/bond masters,
* where we coerce the link as disconnect if it has no slaves. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment