From patchwork Wed Mar 25 06:57:17 2009 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: 25048 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 D0EE9DDFD2 for ; Wed, 25 Mar 2009 17:58:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755952AbZCYG6U (ORCPT ); Wed, 25 Mar 2009 02:58:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756014AbZCYG6Q (ORCPT ); Wed, 25 Mar 2009 02:58:16 -0400 Received: from mtagate3.de.ibm.com ([195.212.29.152]:47650 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755453AbZCYG6M (ORCPT ); Wed, 25 Mar 2009 02:58:12 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate3.de.ibm.com (8.14.3/8.13.8) with ESMTP id n2P6wAwV151056; Wed, 25 Mar 2009 06:58:10 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.2) with ESMTP id n2P6w9Hl4120602; Wed, 25 Mar 2009 07:58:09 +0100 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 n2P6w9Bd027533; Wed, 25 Mar 2009 07:58:09 +0100 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 n2P6w9Gr027530; Wed, 25 Mar 2009 07:58:09 +0100 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 24631) id 33A1F1224105; Wed, 25 Mar 2009 07:58:09 +0100 (CET) Message-Id: <20090325065809.091751000@de.ibm.com> User-Agent: quilt/0.47-1 Date: Wed, 25 Mar 2009 07:57:17 +0100 From: frank.blaschka@de.ibm.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, Klaus-Dieter Wacker Subject: [patch 4/6] [PATCH] qeth: unregister MAC addresses during recovery. References: <20090325065713.054133000@de.ibm.com> Content-Disposition: inline; filename=609-qeth-unreg-macs.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Klaus-Dieter Wacker qeth: Unregister MAC addresses from device (layer 2) during recovery cycle. When the device is set online the MAC addresses are registered again on the device. Signed-off-by: Klaus-Dieter Wacker Signed-off-by: Frank Blaschka --- drivers/s390/net/qeth_l2_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 2009-02-18 12:06:32.000000000 +0100 +++ linux-2.6-patched/drivers/s390/net/qeth_l2_main.c 2009-02-18 12:06:32.000000000 +0100 @@ -378,7 +378,8 @@ static int qeth_l2_stop_card(struct qeth dev_close(card->dev); rtnl_unlock(); } - if (!card->use_hard_stop) { + if (!card->use_hard_stop || + recovery_mode) { __u8 *mac = &card->dev->dev_addr[0]; rc = qeth_l2_send_delmac(card, mac); QETH_DBF_TEXT_(SETUP, 2, "Lerr%d", rc); @@ -387,7 +388,8 @@ static int qeth_l2_stop_card(struct qeth } if (card->state == CARD_STATE_SOFTSETUP) { qeth_l2_process_vlans(card, 1); - if (!card->use_hard_stop) + if (!card->use_hard_stop || + recovery_mode) qeth_l2_del_all_mc(card); qeth_clear_ipacmd_list(card); card->state = CARD_STATE_HARDSETUP;