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

Commit b22d73d6 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: don't apply takeover changes to RXIP 



When takeover is switched off, current code clears the 'TAKEOVER' flag on
all IPs. But the flag is also used for RXIP addresses, and those should
not be affected by the takeover mode.
Fix the behaviour by consistenly applying takover logic to NORMAL
addresses only.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7fbd9493

drivers/s390/net/qeth_l3_main.c

+3 −2
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card, 


	if (!card->ipato.enabled)

		return 0;

	if (addr->type != QETH_IP_TYPE_NORMAL)

		return 0;



	qeth_l3_convert_addr_to_bits((u8 *) &addr->u, addr_bits,

				  (addr->proto == QETH_PROT_IPV4)? 4:16);
@@ -290,8 +292,7 @@ int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *tmp_addr) 
		memcpy(addr, tmp_addr, sizeof(struct qeth_ipaddr));

		addr->ref_counter = 1;



		if (addr->type == QETH_IP_TYPE_NORMAL  &&

				qeth_l3_is_addr_covered_by_ipato(card, addr)) {

		if (qeth_l3_is_addr_covered_by_ipato(card, addr)) {

			QETH_CARD_TEXT(card, 2, "tkovaddr");

			addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG;

		}

drivers/s390/net/qeth_l3_sys.c

+3 −2
Original line number Diff line number Diff line
@@ -396,10 +396,11 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev, 
	card->ipato.enabled = enable;



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

		if (addr->type != QETH_IP_TYPE_NORMAL)

			continue;

		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))

		else if (qeth_l3_is_addr_covered_by_ipato(card, addr))

			addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG;

	}

out: