aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUrsula Braun <braunu@de.ibm.com>2007-06-20 06:58:02 -0400
committerJeff Garzik <jeff@garzik.org>2007-06-20 19:12:42 -0400
commitadd3f2fa7a6cec16d35a95b9078e1ecc80a6f332 (patch)
tree318ef63e12c33bd115dd86954343b0ae27795141 /drivers
parentd81ef0fb76ef2eb7126f64cb34217d2ddfb48483 (diff)
s390: avoid inconsistent lock state in qeth
ipv6_regen_rndid in net/ipv6/addrconf.c makes use of "write_lock_bh" for its inet6_dev->lock. It may run in softirq-context. qeth makes use of "read_lock" for the same inet6_dev->lock. To avoid a potential deadlock situation, qeth should make use of "read_lock_bh" for its usages of inet6_dev->lock. Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/net/qeth_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index c5a95079b5ed..79b7379a7849 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -5850,9 +5850,9 @@ qeth_add_vlan_mc6(struct qeth_card *card)
5850 in_dev = in6_dev_get(netdev); 5850 in_dev = in6_dev_get(netdev);
5851 if (!in_dev) 5851 if (!in_dev)
5852 continue; 5852 continue;
5853 read_lock(&in_dev->lock); 5853 read_lock_bh(&in_dev->lock);
5854 qeth_add_mc6(card,in_dev); 5854 qeth_add_mc6(card,in_dev);
5855 read_unlock(&in_dev->lock); 5855 read_unlock_bh(&in_dev->lock);
5856 in6_dev_put(in_dev); 5856 in6_dev_put(in_dev);
5857 } 5857 }
5858#endif /* CONFIG_QETH_VLAN */ 5858#endif /* CONFIG_QETH_VLAN */
@@ -5869,10 +5869,10 @@ qeth_add_multicast_ipv6(struct qeth_card *card)
5869 in6_dev = in6_dev_get(card->dev); 5869 in6_dev = in6_dev_get(card->dev);
5870 if (in6_dev == NULL) 5870 if (in6_dev == NULL)
5871 return; 5871 return;
5872 read_lock(&in6_dev->lock); 5872 read_lock_bh(&in6_dev->lock);
5873 qeth_add_mc6(card, in6_dev); 5873 qeth_add_mc6(card, in6_dev);
5874 qeth_add_vlan_mc6(card); 5874 qeth_add_vlan_mc6(card);
5875 read_unlock(&in6_dev->lock); 5875 read_unlock_bh(&in6_dev->lock);
5876 in6_dev_put(in6_dev); 5876 in6_dev_put(in6_dev);
5877} 5877}
5878#endif /* CONFIG_QETH_IPV6 */ 5878#endif /* CONFIG_QETH_IPV6 */