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

[ Upstream commit 4964c66fd49b2e2342da35358f2ff74614bcbaee ]

This reverts commit cb816192d986f7596009dedcf2201fe2e5bc2aa7.

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: cb816192d986 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 91650e8..7472a09 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -249,8 +249,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;
@@ -328,9 +327,8 @@ 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)
-                       addr->ref_counter++;
+                       if (addr->type == QETH_IP_TYPE_NORMAL)
+                               addr->ref_counter++;
        }
 
        return rc;