Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e98ac48 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

qeth: check for completion of a running recovery 



When a recovery is started for a qeth device, additional invocations
to change a mac address, to configure a VLAN interface on top, or to
add multicast addresses should wait till recovery is finished,
otherwise recovery might fail.

Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 932e1583

drivers/s390/net/qeth_l2_main.c

+15 −0
Original line number Diff line number Diff line
@@ -327,6 +327,10 @@ static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 
	struct qeth_vlan_vid *id;



	QETH_DBF_TEXT_(TRACE, 4, "aid:%d", vid);

	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {

		QETH_DBF_TEXT(TRACE, 3, "aidREC");

		return;

	}

	id = kmalloc(sizeof(struct qeth_vlan_vid), GFP_ATOMIC);

	if (id) {

		id->vid = vid;
@@ -343,6 +347,10 @@ static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 
	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid);

	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {

		QETH_DBF_TEXT(TRACE, 3, "kidREC");

		return;

	}

	spin_lock_bh(&card->vlanlock);

	list_for_each_entry(id, &card->vid_list, list) {

		if (id->vid == vid) {
@@ -594,6 +602,10 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 
	}

	QETH_DBF_TEXT_(TRACE, 3, "%s", CARD_BUS_ID(card));

	QETH_DBF_HEX(TRACE, 3, addr->sa_data, OSA_ADDR_LEN);

	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {

		QETH_DBF_TEXT(TRACE, 3, "setmcREC");

		return -ERESTARTSYS;

	}

	rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]);

	if (!rc)

		rc = qeth_l2_send_setmac(card, addr->sa_data);
@@ -609,6 +621,9 @@ static void qeth_l2_set_multicast_list(struct net_device *dev) 
		return ;



	QETH_DBF_TEXT(TRACE, 3, "setmulti");

	if (qeth_threads_running(card, QETH_RECOVER_THREAD) &&

	    (card->state != CARD_STATE_UP))

		return;

	qeth_l2_del_all_mc(card);

	spin_lock_bh(&card->mclock);

	for (dm = dev->mc_list; dm; dm = dm->next)

drivers/s390/net/qeth_l3_main.c

+7 −0
Original line number Diff line number Diff line
@@ -1838,6 +1838,10 @@ static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 
	unsigned long flags;



	QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid);

	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {

		QETH_DBF_TEXT(TRACE, 3, "kidREC");

		return;

	}

	spin_lock_irqsave(&card->vlanlock, flags);

	/* unregister IP addresses of vlan device */

	qeth_l3_free_vlan_addresses(card, vid);
@@ -2101,6 +2105,9 @@ static void qeth_l3_set_multicast_list(struct net_device *dev) 
	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 3, "setmulti");

	if (qeth_threads_running(card, QETH_RECOVER_THREAD) &&

	    (card->state != CARD_STATE_UP))

		return;

	qeth_l3_delete_mc_addresses(card);

	qeth_l3_add_multicast_ipv4(card);

#ifdef CONFIG_QETH_IPV6