Commit 4964c66f authored Feb 27, 2018 by Julian Wiedmann Committed by David S. Miller Feb 28, 2018

Revert "s390/qeth: fix using of ref counter for rxip addresses"



This reverts commit cb816192.

The issue this attempted to fix never actually occurs.
l3_add_rxip() checks (via l3_ip_from_hash()) if the requested address
was previously added to the card. If so, it returns -EEXIST and doesn't
call l3_add_ip().
As a result, the "address exists" path in l3_add_ip() is never taken
for rxip addresses, and this patch had no effect.

Fixes: cb816192 ("s390/qeth: fix using of ref counter for rxip addresses")
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 14d066c3

drivers/s390/net/qeth_l3_main.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -167,8 +167,7 @@ int qeth_l3_delete_ip(struct qeth_card card, struct qeth_ipaddr tmp_addr)
		return -ENOENT;

		addr->ref_counter--;
		if (addr->ref_counter > 0 && (addr->type == QETH_IP_TYPE_NORMAL \|\|
		addr->type == QETH_IP_TYPE_RXIP))
		if (addr->type == QETH_IP_TYPE_NORMAL && addr->ref_counter > 0)
		return rc;
		if (addr->in_progress)
		return -EINPROGRESS;
		@@ -246,8 +245,7 @@ int qeth_l3_add_ip(struct qeth_card card, struct qeth_ipaddr tmp_addr)
		kfree(addr);
		}
		} else {
		if (addr->type == QETH_IP_TYPE_NORMAL \|\|
		addr->type == QETH_IP_TYPE_RXIP)
		if (addr->type == QETH_IP_TYPE_NORMAL)
		addr->ref_counter++;
		}