diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:27 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:27 +0800 |
| commit | cb370744bc101be91a0bc3e9fbdb670ab44df97d (patch) | |
| tree | 1a84448b43dee0f4e255f9434e776c51812ddb35 /drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |
| parent | 67f07b48af22065412ba4e78472121c0a9f58329 (diff) | |
| parent | f40b3cc69de8c97bbcdb74e3cffda06ffcad2cd7 (diff) | |
Merge tag 'v4.1.38' into linux-linaro-lsk-v4.1lsk-v4.1-17.02
This is the 4.1.38 stable release
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_multicast.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 0d23e0568deb..b9705395b0aa 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -522,8 +522,11 @@ void ipoib_mcast_join_task(struct work_struct *work) if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags)) return; - if (ib_query_port(priv->ca, priv->port, &port_attr) || - port_attr.state != IB_PORT_ACTIVE) { + if (ib_query_port(priv->ca, priv->port, &port_attr)) { + ipoib_dbg(priv, "ib_query_port() failed\n"); + return; + } + if (port_attr.state != IB_PORT_ACTIVE) { ipoib_dbg(priv, "port state is not ACTIVE (state = %d) suspending join task\n", port_attr.state); return; |