Fix pingpong examples' handling of specifying device by name

Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/ChangeLog b/ChangeLog
index c24b04129cf0628355983451ac554f95740a190c..2966074a67752bf667af1f0482bfab89bc9d0cf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-01  Roland Dreier  <rdreier@cisco.com>
+
+       * examples/rc_pingpong.c, examples/uc_pingpong.c,
+       examples/ud_pingpong.c, examples/srq_pingpong.c: Fix bug in
+       searching for device by name when there's more than one device.
+
 2006-01-31  Roland Dreier  <rdreier@cisco.com>
 
        * include/infiniband/verbs.h, include/infiniband/driver.h: Remove

diff --git a/examples/rc_pingpong.c b/examples/rc_pingpong.c
index c4494ba8544bfa5d89a33fce5550eb2e75d4c5ce..9219fe60debe88d4f0bf1a7af5a3059107352499 100644 (file)
--- a/examples/rc_pingpong.c
+++ b/examples/rc_pingpong.c
@@ -547,7 +547,7 @@ int main(int argc, char *argv[])
                        return 1;
                }
        } else {
-               for (ib_dev = *dev_list; ib_dev; ++dev_list)
+               for (; (ib_dev = *dev_list); ++dev_list)
                        if (!strcmp(ibv_get_device_name(ib_dev), ib_devname))
                                break;
                if (!ib_dev) {

diff --git a/examples/srq_pingpong.c b/examples/srq_pingpong.c
index 8509e03673f4211266466dc055c4b10d040fd355..6fb28c39c89e0aab8d611998f9b644ff1f71a93e 100644 (file)
--- a/examples/srq_pingpong.c
+++ b/examples/srq_pingpong.c
@@ -628,7 +628,7 @@ int main(int argc, char *argv[])
                        return 1;
                }
        } else {
-               for (ib_dev = *dev_list; ib_dev; ++dev_list)
+               for (; (ib_dev = *dev_list); ++dev_list)
                        if (!strcmp(ibv_get_device_name(ib_dev), ib_devname))
                                break;
                if (!ib_dev) {

diff --git a/examples/uc_pingpong.c b/examples/uc_pingpong.c
index 41e612e0c829aab17d2e49336ad0f0b8453ed477..7cb77e15c0d8eb2c4fb700eabebaa0a82bb2b06f 100644 (file)
--- a/examples/uc_pingpong.c
+++ b/examples/uc_pingpong.c
@@ -535,7 +535,7 @@ int main(int argc, char *argv[])
                        return 1;
                }
        } else {
-               for (ib_dev = *dev_list; ib_dev; ++dev_list)
+               for (; (ib_dev = *dev_list); ++dev_list)
                        if (!strcmp(ibv_get_device_name(ib_dev), ib_devname))
                                break;
                if (!ib_dev) {

diff --git a/examples/ud_pingpong.c b/examples/ud_pingpong.c
index f0a81194e55577774d825d49debf6472834f33b3..68cb6f0ea7baea66985e1dfb22b3b42e23b50b46 100644 (file)
--- a/examples/ud_pingpong.c
+++ b/examples/ud_pingpong.c
@@ -533,7 +533,7 @@ int main(int argc, char *argv[])
                        return 1;
                }
        } else {
-               for (ib_dev = *dev_list; ib_dev; ++dev_list)
+               for (; (ib_dev = *dev_list); ++dev_list)
                        if (!strcmp(ibv_get_device_name(ib_dev), ib_devname))
                                break;
                if (!ib_dev) {