---

yaml --- r: 222799 b: refs/heads/master c: 21d6060 h: refs/heads/master i: 222797: 04f67ad 222795: e2b6529 222791: b495711 222783: 8e9b032 v: v3
git-mirror · Dec 2, 2010 · a2a42a7 · a2a42a7
1 parent cec8cf8
commit a2a42a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);