lkml.org 
[lkml]   [2018]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 093/122] Revert "s390/qeth: fix using of ref counter for rxip addresses"
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Julian Wiedmann <jwi@linux.vnet.ibm.com>


    [ 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>
    ---
    drivers/s390/net/qeth_l3_main.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    --- a/drivers/s390/net/qeth_l3_main.c
    +++ b/drivers/s390/net/qeth_l3_main.c
    @@ -250,8 +250,7 @@ int qeth_l3_delete_ip(struct qeth_card *
    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;
    @@ -329,9 +328,8 @@ int qeth_l3_add_ip(struct qeth_card *car
    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;

    \
     
     \ /
      Last update: 2018-03-07 21:27    [W:4.018 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site