lkml.org 
[lkml]   [2014]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 057/104] sparc64: ldc_connect() should not return EINVAL when handshake is in progress.
    Date
    From: Sowmini Varadhan <sowmini.varadhan@oracle.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    [ Upstream commit 4ec1b01029b4facb651b8ef70bc20a4be4cebc63 ]

    The LDC handshake could have been asynchronously triggered
    after ldc_bind() enables the ldc_rx() receive interrupt-handler
    (and thus intercepts incoming control packets)
    and before vio_port_up() calls ldc_connect(). If that is the case,
    ldc_connect() should return 0 and let the state-machine
    progress.

    Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
    Acked-by: Karl Volz <karl.volz@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/sparc/kernel/ldc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
    index e01d75d40329..66dacd56bb10 100644
    --- a/arch/sparc/kernel/ldc.c
    +++ b/arch/sparc/kernel/ldc.c
    @@ -1336,7 +1336,7 @@ int ldc_connect(struct ldc_channel *lp)
    if (!(lp->flags & LDC_FLAG_ALLOCED_QUEUES) ||
    !(lp->flags & LDC_FLAG_REGISTERED_QUEUES) ||
    lp->hs_state != LDC_HS_OPEN)
    - err = -EINVAL;
    + err = ((lp->hs_state > LDC_HS_OPEN) ? 0 : -EINVAL);
    else
    err = start_handshake(lp);

    --
    2.0.4


    \
     
     \ /
      Last update: 2014-08-20 14:21    [W:2.335 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site