netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: frank.blaschka@de.ibm.com
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
	Klaus-Dieter Wacker <kdwacker@de.ibm.com>
Subject: [patch 4/6] [PATCH] qeth: unregister MAC addresses during recovery.
Date: Wed, 25 Mar 2009 07:57:17 +0100	[thread overview]
Message-ID: <20090325065809.091751000@de.ibm.com> (raw)
In-Reply-To: 20090325065713.054133000@de.ibm.com

[-- Attachment #1: 609-qeth-unreg-macs.diff --]
[-- Type: text/plain, Size: 1349 bytes --]

From: Klaus-Dieter Wacker <kdwacker@de.ibm.com>

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 <kdwacker@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---

 drivers/s390/net/qeth_l2_main.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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;


  parent reply	other threads:[~2009-03-25  6:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-25  6:57 [patch 0/6] s390: qeth fixes for 2.6.30 frank.blaschka
2009-03-25  6:57 ` [patch 1/6] [PATCH] qeth: struct device - replace bus_id with dev_name(), dev_set_name() frank.blaschka
2009-03-25  6:57 ` [patch 2/6] [PATCH] qeth: add statistics for tx csum frank.blaschka
2009-03-25  6:57 ` [patch 3/6] [PATCH] qeth: remove EDDP frank.blaschka
2009-03-25  6:57 ` frank.blaschka [this message]
2009-03-25  6:57 ` [patch 5/6] [PATCH] qeth: check for completion of a running recovery frank.blaschka
2009-03-25  6:57 ` [patch 6/6] [PATCH] qeth: fix wait_event_timeout handling frank.blaschka
2009-03-25  7:08 ` [patch 0/6] s390: qeth fixes for 2.6.30 David Miller
2009-03-25  8:25   ` Frank Blaschka
2009-03-25 23:47     ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090325065809.091751000@de.ibm.com \
    --to=frank.blaschka@de.ibm.com \
    --cc=davem@davemloft.net \
    --cc=kdwacker@de.ibm.com \
    --cc=linux-s390@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).