]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: use netif_is_bridge_port
authorTobias Klauser <tklauser@distanz.ch>
Mon, 18 Dec 2023 15:32:45 +0000 (00:32 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Dec 2023 09:41:50 +0000 (10:41 +0100)
[ Upstream commit 1b699bf3a8786f7d41eebd9f6ba673185fa5b6bd ]

Use netif_is_bridge_port defined in <linux/netdevice.h> instead of
open-coding it.

Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ksmbd/transport_tcp.c

index d1d7954368a560eb845b35c236442917140f35f3..4995f74fb21ceb9443bb49edd28a6e1511df9bf0 100644 (file)
@@ -505,7 +505,7 @@ static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event,
 
        switch (event) {
        case NETDEV_UP:
-               if (netdev->priv_flags & IFF_BRIDGE_PORT)
+               if (netif_is_bridge_port(netdev))
                        return NOTIFY_OK;
 
                list_for_each_entry(iface, &iface_list, entry) {
@@ -614,7 +614,7 @@ int ksmbd_tcp_set_interfaces(char *ifc_list, int ifc_list_sz)
 
                rtnl_lock();
                for_each_netdev(&init_net, netdev) {
-                       if (netdev->priv_flags & IFF_BRIDGE_PORT)
+                       if (netif_is_bridge_port(netdev))
                                continue;
                        if (!alloc_iface(kstrdup(netdev->name, GFP_KERNEL)))
                                return -ENOMEM;