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

Commit 6ed7c48e authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Greg Kroah-Hartman
Browse files

s390/qeth: apply takeover changes when mode is toggled 




[ Upstream commit 7fbd9493f0eeae8cef58300505a9ef5c8fce6313 ]

Just as for an explicit enable/disable, toggling the takeover mode also
requires that the IP addresses get updated. Otherwise all IPs that were
added to the table before the mode-toggle, get registered with the old
settings.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7493d98e

drivers/s390/net/qeth_core.h

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ enum qeth_cq { 
};



struct qeth_ipato {

	int enabled;

	bool enabled;

	int invert4;

	int invert6;

	struct list_head entries;

drivers/s390/net/qeth_core_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static int qeth_setup_card(struct qeth_card *card) 
	qeth_set_intial_options(card);

	/* IP address takeover */

	INIT_LIST_HEAD(&card->ipato.entries);

	card->ipato.enabled = 0;

	card->ipato.enabled = false;

	card->ipato.invert4 = 0;

	card->ipato.invert6 = 0;

	/* init QDIO stuff */

drivers/s390/net/qeth_l3_sys.c

+17 −18
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev, 
	struct qeth_card *card = dev_get_drvdata(dev);

	struct qeth_ipaddr *addr;

	int i, rc = 0;

	bool enable;



	if (!card)

		return -EINVAL;
@@ -386,25 +387,23 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev, 
	}



	if (sysfs_streq(buf, "toggle")) {

		card->ipato.enabled = (card->ipato.enabled)? 0 : 1;

	} else if (sysfs_streq(buf, "1")) {

		card->ipato.enabled = 1;

		hash_for_each(card->ip_htable, i, addr, hnode) {

				if ((addr->type == QETH_IP_TYPE_NORMAL) &&

				qeth_l3_is_addr_covered_by_ipato(card, addr))

					addr->set_flags |=

					QETH_IPA_SETIP_TAKEOVER_FLAG;

		enable = !card->ipato.enabled;

	} else if (kstrtobool(buf, &enable)) {

		rc = -EINVAL;

		goto out;

	}

	} else if (sysfs_streq(buf, "0")) {

		card->ipato.enabled = 0;



	if (card->ipato.enabled == enable)

		goto out;

	card->ipato.enabled = enable;



	hash_for_each(card->ip_htable, i, addr, hnode) {

			if (addr->set_flags &

			QETH_IPA_SETIP_TAKEOVER_FLAG)

				addr->set_flags &=

				~QETH_IPA_SETIP_TAKEOVER_FLAG;

		if (!enable)

			addr->set_flags &= ~QETH_IPA_SETIP_TAKEOVER_FLAG;

		else if (addr->type == QETH_IP_TYPE_NORMAL &&

			 qeth_l3_is_addr_covered_by_ipato(card, addr))

			addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG;

	}

	} else

		rc = -EINVAL;

out:

	mutex_unlock(&card->conf_mutex);

	return rc ? rc : count;