Skip to content

Commit 16bff2b

Browse files
committed
net: bridge: use netdev_lockdep_set_classes()
JIRA: https://issues.redhat.com/browse/RHEL-6066 Upstream Status: net.git commit c74e103 commit c74e103 Author: Eric Dumazet <edumazet@google.com> Date: Mon Feb 12 14:06:59 2024 +0000 net: bridge: use netdev_lockdep_set_classes() br_set_lockdep_class() is missing many details. Use generic netdev_lockdep_set_classes() to not worry anymore. Signed-off-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20240212140700.2795436-3-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
1 parent 2bf4514 commit 16bff2b

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

net/bridge/br_device.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,6 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
108108
return NETDEV_TX_OK;
109109
}
110110

111-
static struct lock_class_key bridge_netdev_addr_lock_key;
112-
113-
static void br_set_lockdep_class(struct net_device *dev)
114-
{
115-
lockdep_set_class(&dev->addr_list_lock, &bridge_netdev_addr_lock_key);
116-
}
117-
118111
static int br_dev_init(struct net_device *dev)
119112
{
120113
struct net_bridge *br = netdev_priv(dev);
@@ -153,7 +146,7 @@ static int br_dev_init(struct net_device *dev)
153146
br_fdb_hash_fini(br);
154147
}
155148

156-
br_set_lockdep_class(dev);
149+
netdev_lockdep_set_classes(dev);
157150
return err;
158151
}
159152

0 commit comments

Comments
 (0)