Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 224962
b: refs/heads/master
c: f154b79
h: refs/heads/master
v: v3
  • Loading branch information
Einar Lueck authored and David S. Miller committed Dec 10, 2010
1 parent 478fdb2 commit 30e296b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d0ddf30fdd2b98fb547ffa33bb79a7a96ef8d7dd
refs/heads/master: f154b79cd7db221240ab6e8e4d844d3a3f10b04c
5 changes: 4 additions & 1 deletion trunk/drivers/s390/net/qeth_l3_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 30e296b

Please sign in to comment.