aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorUrsula Braun <ursula.braun@de.ibm.com>2008-09-19 06:56:02 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-09-24 20:47:54 -0400
commitf1d58672de4e89478e0b02ea8fd1f60eb0626457 (patch)
tree799abbf3cdcde954ceff2008fe907c3a7dfaabf9 /drivers/s390
parentae19161e28a7b48d2752eff3ac8eb7703986c313 (diff)
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 <ursula.braun@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/net/qeth_l2_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 3ac3cc1e03cc..573b5e564edd 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)
559 "device %s: x%x\n", CARD_BUS_ID(card), rc); 559 "device %s: x%x\n", CARD_BUS_ID(card), rc);
560 } 560 }
561 561
562 if (card->info.guestlan) { 562 if ((card->info.type == QETH_CARD_TYPE_IQD) ||
563 (card->info.guestlan)) {
563 rc = qeth_setadpparms_change_macaddr(card); 564 rc = qeth_setadpparms_change_macaddr(card);
564 if (rc) { 565 if (rc) {
565 QETH_DBF_MESSAGE(2, "couldn't get MAC address on " 566 QETH_DBF_MESSAGE(2, "couldn't get MAC address on "