From 30e296b05066ab7fc12f753592bdaa622ec3d713 Mon Sep 17 00:00:00 2001 From: Einar Lueck Date: Wed, 8 Dec 2010 02:57:59 +0000 Subject: [PATCH] --- yaml --- r: 224962 b: refs/heads/master c: f154b79cd7db221240ab6e8e4d844d3a3f10b04c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_l3_main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2fcae3dd44ae..b04150a7e4f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0ddf30fdd2b98fb547ffa33bb79a7a96ef8d7dd +refs/heads/master: f154b79cd7db221240ab6e8e4d844d3a3f10b04c diff --git a/trunk/drivers/s390/net/qeth_l3_main.c b/trunk/drivers/s390/net/qeth_l3_main.c index a7590551e574..d5e40c3e4bc3 100644 --- a/trunk/drivers/s390/net/qeth_l3_main.c +++ b/trunk/drivers/s390/net/qeth_l3_main.c @@ -456,8 +456,11 @@ static void qeth_l3_set_ip_addr_list(struct qeth_card *card) QETH_CARD_TEXT(card, 2, "sdiplist"); QETH_CARD_HEX(card, 2, &card, sizeof(void *)); - if (card->options.sniffer) + if ((card->state != CARD_STATE_UP && + card->state != CARD_STATE_SOFTSETUP) || card->options.sniffer) { return; + } + spin_lock_irqsave(&card->ip_lock, flags); tbd_list = card->ip_tbd_list; card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_ATOMIC);