net: s/dev_get_flags/netif_get_flags/

Commit cc34acd577f1 ("docs: net: document new locking reality")
introduced netif_ vs dev_ function semantics: the former expects locked
netdev, the latter takes care of the locking. We don't strictly
follow this semantics on either side, but there are more dev_xxx handlers
now that don't fit. Rename them to netif_xxx where appropriate.

Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250717172333.1288349-6-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 2331e698a65b48e9c9e41ebd1e8ce671e22b4b8f..4f86b56fee264b882801986909eae3bf49832733 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -65,7 +65,7 @@ static int rxe_query_port(struct ib_device *ibdev,
        attr->state = ib_get_curr_port_state(ndev);
        if (attr->state == IB_PORT_ACTIVE)
                attr->phys_state = IB_PORT_PHYS_STATE_LINK_UP;
-       else if (dev_get_flags(ndev) & IFF_UP)
+       else if (netif_get_flags(ndev) & IFF_UP)
                attr->phys_state = IB_PORT_PHYS_STATE_POLLING;
        else
                attr->phys_state = IB_PORT_PHYS_STATE_DISABLED;

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 63d17cea2e95f93fad36f34d89a112fce7fd16a5..fca92d1fea227b6385f72c6365e8d6a7f8f972dc 100644 (file)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -7847,7 +7847,7 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,
                if (!ksmbd_find_netdev_name_iface_list(netdev->name))
                        continue;
 
-               flags = dev_get_flags(netdev);
+               flags = netif_get_flags(netdev);
                if (!(flags & IFF_RUNNING))
                        continue;
 ipv6_retry:

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 8978fbfbd644ada5f240a7ac7eb2873ff5a253d7..8370cd0f8f6b4a5b5d375f807854268f09395e4a 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4196,7 +4196,7 @@ int generic_hwtstamp_set_lower(struct net_device *dev,
                               struct kernel_hwtstamp_config *kernel_cfg,
                               struct netlink_ext_ack *extack);
 int dev_ethtool(struct net *net, struct ifreq *ifr, void __user *userdata);
-unsigned int dev_get_flags(const struct net_device *);
+unsigned int netif_get_flags(const struct net_device *dev);
 int __dev_change_flags(struct net_device *dev, unsigned int flags,
                       struct netlink_ext_ack *extack);
 int netif_change_flags(struct net_device *dev, unsigned int flags,

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 9a6df8c1daf91a3a4074d9c77f0b854f0718de16..7ffd3386a8429bca43acf5376b00ec8b41662879 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -483,7 +483,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
        case NETDEV_UP:
                /* Put all VLANs for this dev in the up state too.  */
                vlan_group_for_each_dev(grp, i, vlandev) {
-                       flgs = dev_get_flags(vlandev);
+                       flgs = netif_get_flags(vlandev);
                        if (flgs & IFF_UP)
                                continue;
 

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 6e337937d0d7b53200d2fc70c20f9f5ccd77fee1..4e2d53b2722104b8a5811e940bdc12072f368eee 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -479,7 +479,7 @@ static int br_fill_ifinfo(struct sk_buff *skb,
        hdr->__ifi_pad = 0;
        hdr->ifi_type = dev->type;
        hdr->ifi_index = dev->ifindex;
-       hdr->ifi_flags = dev_get_flags(dev);
+       hdr->ifi_flags = netif_get_flags(dev);
        hdr->ifi_change = 0;
 
        if (nla_put_string(skb, IFLA_IFNAME, dev->name) ||

diff --git a/net/core/dev.c b/net/core/dev.c
index a056f0dfc516a191c0d7fe6abe829dcccfba0d85..25905bbf1972434b82634c5a95fe9722c336bec4 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -9454,12 +9454,12 @@ void dev_set_rx_mode(struct net_device *dev)
 }
 
 /**
- *     dev_get_flags - get flags reported to userspace
- *     @dev: device
+ * netif_get_flags() - get flags reported to userspace
+ * @dev: device
  *
- *     Get the combination of flag bits exported through APIs to userspace.
+ * Get the combination of flag bits exported through APIs to userspace.
  */
-unsigned int dev_get_flags(const struct net_device *dev)
+unsigned int netif_get_flags(const struct net_device *dev)
 {
        unsigned int flags;
 
@@ -9482,7 +9482,7 @@ unsigned int dev_get_flags(const struct net_device *dev)
 
        return flags;
 }
-EXPORT_SYMBOL(dev_get_flags);
+EXPORT_SYMBOL(netif_get_flags);
 
 int __dev_change_flags(struct net_device *dev, unsigned int flags,
                       struct netlink_ext_ack *extack)

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index ceb2d63a818af5d653c8391622ef559ba1b83bf1..9c0ad7f4b5d810dfd09bf3e27c38523478306617 100644 (file)
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -147,7 +147,7 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm
 
        switch (cmd) {
        case SIOCGIFFLAGS:      /* Get interface flags */
-               ifr->ifr_flags = (short) dev_get_flags(dev);
+               ifr->ifr_flags = (short)netif_get_flags(dev);
                return 0;
 
        case SIOCGIFMETRIC:     /* Get the metric on the interface

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 108995b6eced389208002cb3f1f698e5d6815283..094b085cff20685f8a417ed276f3877f2a36a4af 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2038,7 +2038,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
        ifm->__ifi_pad = 0;
        ifm->ifi_type = READ_ONCE(dev->type);
        ifm->ifi_index = READ_ONCE(dev->ifindex);
-       ifm->ifi_flags = dev_get_flags(dev);
+       ifm->ifi_flags = netif_get_flags(dev);
        ifm->ifi_change = change;
 
        if (tgt_netnsid >= 0 && nla_put_s32(skb, IFLA_TARGET_NETNSID, tgt_netnsid))
@@ -5227,7 +5227,7 @@ int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
        ifm->__ifi_pad = 0;
        ifm->ifi_type = dev->type;
        ifm->ifi_index = dev->ifindex;
-       ifm->ifi_flags = dev_get_flags(dev);
+       ifm->ifi_flags = netif_get_flags(dev);
        ifm->ifi_change = 0;
 
 

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index fd1e1507a22406dad20a5a02403301eaca6d24eb..6e1b94796f67accd63538dab289e665512920a84 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -1524,7 +1524,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
                fib_disable_ip(dev, event, false);
                break;
        case NETDEV_CHANGE:
-               flags = dev_get_flags(dev);
+               flags = netif_get_flags(dev);
                if (flags & (IFF_RUNNING | IFF_LOWER_UP))
                        fib_sync_up(dev, RTNH_F_LINKDOWN);
                else

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index a2f04992f5795ee56fc3af95f943988c998c18ee..a5f3c8459758f10850673583a886d2b212940596 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -2087,7 +2087,7 @@ int fib_sync_up(struct net_device *dev, unsigned char nh_flags)
                return 0;
 
        if (nh_flags & RTNH_F_DEAD) {
-               unsigned int flags = dev_get_flags(dev);
+               unsigned int flags = netif_get_flags(dev);
 
                if (flags & (IFF_RUNNING | IFF_LOWER_UP))
                        nh_flags |= RTNH_F_LINKDOWN;

diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c
index e808801ab9b818268aa370ecd789c0596bc3fbb4..29118c43ebf5f1e91292fe227d4afde313e564bb 100644 (file)
--- a/net/ipv4/nexthop.c
+++ b/net/ipv4/nexthop.c
@@ -3884,7 +3884,7 @@ static int nh_netdev_event(struct notifier_block *this,
                nexthop_flush_dev(dev, event);
                break;
        case NETDEV_CHANGE:
-               if (!(dev_get_flags(dev) & (IFF_RUNNING | IFF_LOWER_UP)))
+               if (!(netif_get_flags(dev) & (IFF_RUNNING | IFF_LOWER_UP)))
                        nexthop_flush_dev(dev, event);
                break;
        case NETDEV_CHANGEMTU:

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index c85b1db74b1a4b86fae80eba76754655c8512911..4f1d7d110302afa9606a78b6b07f68e06dfc6e7f 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -6072,7 +6072,7 @@ static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,
        hdr->ifi_type = dev->type;
        ifindex = READ_ONCE(dev->ifindex);
        hdr->ifi_index = ifindex;
-       hdr->ifi_flags = dev_get_flags(dev);
+       hdr->ifi_flags = netif_get_flags(dev);
        hdr->ifi_change = 0;
 
        iflink = dev_get_iflink(dev);

diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 47d7dfd9ad09a49e2483697faa2480549909d84b..25c88cba5c48b9082d1c7c2fee7ae332b06f28ee 100644 (file)
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -706,7 +706,7 @@ static int mpls_nh_assign_dev(struct net *net, struct mpls_route *rt,
        } else {
                unsigned int flags;
 
-               flags = dev_get_flags(dev);
+               flags = netif_get_flags(dev);
                if (!(flags & (IFF_RUNNING | IFF_LOWER_UP)))
                        nh->nh_flags |= RTNH_F_LINKDOWN;
        }
@@ -1616,14 +1616,14 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
                        return notifier_from_errno(err);
                break;
        case NETDEV_UP:
-               flags = dev_get_flags(dev);
+               flags = netif_get_flags(dev);
                if (flags & (IFF_RUNNING | IFF_LOWER_UP))
                        mpls_ifup(dev, RTNH_F_DEAD | RTNH_F_LINKDOWN);
                else
                        mpls_ifup(dev, RTNH_F_DEAD);
                break;
        case NETDEV_CHANGE:
-               flags = dev_get_flags(dev);
+               flags = netif_get_flags(dev);
                if (flags & (IFF_RUNNING | IFF_LOWER_UP)) {
                        mpls_ifup(dev, RTNH_F_DEAD | RTNH_F_LINKDOWN);
                } else {

diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index bea70eb6f03453e5634db5bd1a828c0dd7d9416b..c32a7c6903d53686bc5b51652a7c0574e7085659 100644 (file)
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -431,7 +431,7 @@ static struct nlmsghdr *rtnetlink_ifinfo_prep(struct net_device *dev,
        r->__ifi_pad = 0;
        r->ifi_type = dev->type;
        r->ifi_index = dev->ifindex;
-       r->ifi_flags = dev_get_flags(dev);
+       r->ifi_flags = netif_get_flags(dev);
        r->ifi_change = 0;      /* Wireless changes don't affect those flags */
 
        if (nla_put_string(skb, IFLA_IFNAME, dev->name))