]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hv_netvsc: use netif_is_bond_master() instead of open code
authorJuhee Kang <claudiajkang@gmail.com>
Sun, 10 Oct 2021 04:03:28 +0000 (13:03 +0900)
committerSasha Levin <sashal@kernel.org>
Fri, 15 Mar 2024 14:48:21 +0000 (10:48 -0400)
[ Upstream commit c60882a4566a0a62dc3a40c85131103aad83dcb3 ]

Use netif_is_bond_master() function instead of open code, which is
((event_dev->priv_flags & IFF_BONDING) && (event_dev->flags & IFF_MASTER)).
This patch doesn't change logic.

Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 9cae43da9867 ("hv_netvsc: Register VF in netvsc_probe if NET_DEVICE_REGISTER missed")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/hyperv/netvsc_drv.c

index 9ec1633b89b486e2d67c1a3821fd84778df2f115..e8efcc6a0b05aa9c5520fd1f21fb2d8ccf16bee7 100644 (file)
@@ -2760,8 +2760,7 @@ static int netvsc_netdev_event(struct notifier_block *this,
                return NOTIFY_DONE;
 
        /* Avoid Bonding master dev with same MAC registering as VF */
-       if ((event_dev->priv_flags & IFF_BONDING) &&
-           (event_dev->flags & IFF_MASTER))
+       if (netif_is_bond_master(event_dev))
                return NOTIFY_DONE;
 
        switch (event) {