From 16fa9542a3097d8a9faea9de6ce1945468c1476c Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Fri, 18 May 2007 16:12:54 +0300 Subject: [PATCH] --- yaml --- r: 56747 b: refs/heads/master c: 24bd1e4e32e88cd3d0675482d15bea498a922ca8 h: refs/heads/master i: 56745: 5c72a2cf6d4c15c38a58b5968dd8f38ddb6d54cd 56743: 2fb98b532950cc69181d5a5119a1cf565272bfdb v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 31d03e5a8a44..7311ca0c0a98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56a8c8b6ac4d6edba5153d17730aaf96ba8f1f8c +refs/heads/master: 24bd1e4e32e88cd3d0675482d15bea498a922ca8 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c index e3b0937011d1..c1aad06eb4e9 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -470,7 +470,7 @@ int ipoib_ib_dev_open(struct net_device *dev) ret = ipoib_cm_dev_open(dev); if (ret) { - ipoib_warn(priv, "ipoib_ib_post_receives returned %d\n", ret); + ipoib_warn(priv, "ipoib_cm_dev_open returned %d\n", ret); ipoib_ib_dev_stop(dev, 1); return -1; } diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 54fbead4de01..aae367057a56 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -524,7 +524,7 @@ void ipoib_mcast_join_task(struct work_struct *work) return; if (ib_query_gid(priv->ca, priv->port, 0, &priv->local_gid)) - ipoib_warn(priv, "ib_gid_entry_get() failed\n"); + ipoib_warn(priv, "ib_query_gid() failed\n"); else memcpy(priv->dev->dev_addr + 4, priv->local_gid.raw, sizeof (union ib_gid));