From: Ursula Braun Date: Fri, 19 Sep 2008 10:56:02 +0000 (+0200) Subject: qeth: use firmware MAC-address for layer2 hsi-devices X-Git-Tag: v2.6.28-rc1~717^2~193 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f1d58672de4e89478e0b02ea8fd1f60eb0626457;p=linux-2.6-omap-h63xx.git qeth: use firmware MAC-address for layer2 hsi-devices Real HiperSocket devices in layer2 mode have a firmware-created MAC-address. This change enables the qeth driver to use this firmware MAC-address for layer2 HiperSocket devices. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: Jeff Garzik --- diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 3ac3cc1e03c..573b5e564ed 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/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 "