From d71db15c3223181f97211b3b12cac99d1179ffbf Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 14 Aug 2006 23:00:27 -0700 Subject: [PATCH] --- yaml --- r: 33514 b: refs/heads/master c: 3d8f3f3c3697a7603a802427c9226f5dfe6d67ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e6300cae0f5b..018d73040877 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 239e44e1f05e2163ee066c07a753f9fb445979b2 +refs/heads/master: 3d8f3f3c3697a7603a802427c9226f5dfe6d67ad diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c index 5fff1f93973a..e1327b8fce00 100644 --- a/trunk/drivers/s390/net/qeth_main.c +++ b/trunk/drivers/s390/net/qeth_main.c @@ -8510,9 +8510,9 @@ static int qeth_ipv6_init(void) { qeth_old_arp_constructor = arp_tbl.constructor; - write_lock(&arp_tbl.lock); + write_lock_bh(&arp_tbl.lock); arp_tbl.constructor = qeth_arp_constructor; - write_unlock(&arp_tbl.lock); + write_unlock_bh(&arp_tbl.lock); arp_direct_ops = (struct neigh_ops*) kmalloc(sizeof(struct neigh_ops), GFP_KERNEL); @@ -8528,9 +8528,9 @@ qeth_ipv6_init(void) static void qeth_ipv6_uninit(void) { - write_lock(&arp_tbl.lock); + write_lock_bh(&arp_tbl.lock); arp_tbl.constructor = qeth_old_arp_constructor; - write_unlock(&arp_tbl.lock); + write_unlock_bh(&arp_tbl.lock); kfree(arp_direct_ops); } #endif /* CONFIG_QETH_IPV6 */