IB/ipath: Be more cautious about coming out of freeze mode

[net-next-2.6.git] / drivers / infiniband / hw / ipath / ipath_iba6110.c

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 87b18e928c79982b591cd6d428bbbf0dd2693bca..fdfa95d0dd72b4d4fd1c07d4eedc9af0987af94b 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -509,16 +509,7 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata *dd, char *msg,
                if (!hwerrs) {
                        ipath_dbg("Clearing freezemode on ignored or "
                                  "recovered hardware error\n");
-                       /*
-                        * clear all sends, becauase they have may been
-                        * completed by usercode while in freeze mode, and
-                        * therefore would not be sent, and eventually
-                        * might cause the process to run out of bufs
-                        */
-                       ipath_cancel_sends(dd);
-                       ctrl &= ~INFINIPATH_C_FREEZEMODE;
-                       ipath_write_kreg(dd, dd->ipath_kregs->kr_control,
-                                        ctrl);
+                       ipath_clear_freeze(dd);
                }
        }