From patchwork Fri Sep 19 10:56:02 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frank.blaschka@de.ibm.com X-Patchwork-Id: 602 X-Patchwork-Delegate: jgarzik@pobox.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 67248DDECF for ; Fri, 19 Sep 2008 20:57:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751116AbYISK5j (ORCPT ); Fri, 19 Sep 2008 06:57:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751495AbYISK5j (ORCPT ); Fri, 19 Sep 2008 06:57:39 -0400 Received: from mtagate3.de.ibm.com ([195.212.29.152]:51299 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750927AbYISK5f (ORCPT ); Fri, 19 Sep 2008 06:57:35 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate3.de.ibm.com (8.13.8/8.13.8) with ESMTP id m8JAvNm4289628; Fri, 19 Sep 2008 10:57:23 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id m8JAvMqP2588810; Fri, 19 Sep 2008 12:57:22 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m8JAvJ24003126; Fri, 19 Sep 2008 12:57:19 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m8JAvJhK002773 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Sep 2008 12:57:19 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (localhost.localdomain [127.0.0.1]) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8) with ESMTP id m8JAv2Fq012706; Fri, 19 Sep 2008 12:57:02 +0200 Received: (from blaschka@localhost) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8/Submit) id m8JAv2BM012705; Fri, 19 Sep 2008 12:57:02 +0200 X-Authentication-Warning: tuxmaker.boeblingen.de.ibm.com: blaschka set sender to frank.blaschka@de.ibm.com using -f Message-Id: <20080919105702.427694000@de.ibm.com> References: <20080919105601.986966000@de.ibm.com> User-Agent: quilt/0.46-1 Date: Fri, 19 Sep 2008 12:56:02 +0200 From: frank.blaschka@de.ibm.com To: jgarzik@pobox.com Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, Ursula Braun Subject: [patch 1/2] qeth: use firmware MAC-address for layer2 hsi-devices Content-Disposition: inline; filename=600-qeth-mac.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ursula Braun 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 diff -urpN linux-2.6/drivers/s390/net/qeth_l2_main.c linux-2.6-patched/drivers/s390/net/qeth_l2_main.c --- linux-2.6/drivers/s390/net/qeth_l2_main.c 2008-09-19 00:08:20.000000000 +0200 +++ linux-2.6-patched/drivers/s390/net/qeth_l2_main.c 2008-09-19 00:08:39.000000000 +0200 @@ -559,7 +559,8 @@ static int qeth_l2_request_initial_mac(s "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 "