From a2a42a762883a10de115d32368557b1a634efb66 Mon Sep 17 00:00:00 2001 From: Eli Cohen Date: Thu, 11 Nov 2010 21:05:58 +0000 Subject: [PATCH] --- yaml --- r: 222799 b: refs/heads/master c: 21d606090ec1aacc998276f5af34c43a88f01218 h: refs/heads/master i: 222797: 04f67ad54c243fdc12ac1f9b7d8d51e57f304a10 222795: e2b65290fdf9a66cad8ed591b461162b130fb361 222791: b49571191ee1eaa40ab896ae0d2177e41ae4f7dd 222783: 8e9b032e58d02ffcb5834b9a336c8f696218da39 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mlx4/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index deabb92d364c..0076917ae294 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 328266c561153a0c19084088d5dacd40632dc7ae +refs/heads/master: 21d606090ec1aacc998276f5af34c43a88f01218 diff --git a/trunk/drivers/infiniband/hw/mlx4/main.c b/trunk/drivers/infiniband/hw/mlx4/main.c index e165dd36e908..30e09caf0da9 100644 --- a/trunk/drivers/infiniband/hw/mlx4/main.c +++ b/trunk/drivers/infiniband/hw/mlx4/main.c @@ -242,7 +242,7 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, tmp = iboe_get_mtu(ndev->mtu); props->active_mtu = tmp ? min(props->max_mtu, tmp) : IB_MTU_256; - props->state = netif_running(ndev) && netif_oper_up(ndev) ? + props->state = (netif_running(ndev) && netif_carrier_ok(ndev)) ? IB_PORT_ACTIVE : IB_PORT_DOWN; props->phys_state = state_to_phys_state(props->state);