mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 06:43:09 +00:00
s390/qeth: fine-tune L3 mcast locking
Push the inet6_dev locking down into the helper that actually needs it for walking the mc_list. Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8311c7a252
commit
ddf28100ee
@ -1206,6 +1206,7 @@ static void qeth_l3_add_mc6_to_hash(struct qeth_card *card,
|
||||
if (!tmp)
|
||||
return;
|
||||
|
||||
read_lock_bh(&in6_dev->lock);
|
||||
for (im6 = in6_dev->mc_list; im6 != NULL; im6 = im6->next) {
|
||||
tmp->u.a6.addr = im6->mca_addr;
|
||||
tmp->is_multicast = 1;
|
||||
@ -1228,6 +1229,8 @@ static void qeth_l3_add_mc6_to_hash(struct qeth_card *card,
|
||||
&ipm->hnode, qeth_l3_ipaddr_hash(ipm));
|
||||
|
||||
}
|
||||
read_unlock_bh(&in6_dev->lock);
|
||||
|
||||
kfree(tmp);
|
||||
}
|
||||
|
||||
@ -1253,9 +1256,7 @@ static void qeth_l3_add_vlan_mc6(struct qeth_card *card)
|
||||
in_dev = in6_dev_get(netdev);
|
||||
if (!in_dev)
|
||||
continue;
|
||||
read_lock_bh(&in_dev->lock);
|
||||
qeth_l3_add_mc6_to_hash(card, in_dev);
|
||||
read_unlock_bh(&in_dev->lock);
|
||||
in6_dev_put(in_dev);
|
||||
}
|
||||
}
|
||||
@ -1273,10 +1274,8 @@ static void qeth_l3_add_multicast_ipv6(struct qeth_card *card)
|
||||
return;
|
||||
|
||||
rcu_read_lock();
|
||||
read_lock_bh(&in6_dev->lock);
|
||||
qeth_l3_add_mc6_to_hash(card, in6_dev);
|
||||
qeth_l3_add_vlan_mc6(card);
|
||||
read_unlock_bh(&in6_dev->lock);
|
||||
rcu_read_unlock();
|
||||
in6_dev_put(in6_dev);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user