---

yaml --- r: 111908 b: refs/heads/master c: f1d5867 h: refs/heads/master v: v3
git-mirror · Sep 25, 2008 · 12249e8 · 12249e8
1 parent 13aa3f9
commit 12249e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae19161e28a7b48d2752eff3ac8eb7703986c313
+refs/heads/master: f1d58672de4e89478e0b02ea8fd1f60eb0626457
diff --git a/trunk/drivers/s390/net/qeth_l2_main.c b/trunk/drivers/s390/net/qeth_l2_main.c
@@ -559,7 +559,8 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
 			"device %s: x%x\n", CARD_BUS_ID(card), rc);
 	}
 
-	if (card->info.guestlan) {
+	if ((card->info.type == QETH_CARD_TYPE_IQD) || 
+	    (card->info.guestlan)) {
 		rc = qeth_setadpparms_change_macaddr(card);
 		if (rc) {
 			QETH_DBF_MESSAGE(2, "couldn't get MAC address on "