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

[linux-2.6] / drivers / infiniband / hw / ipath / ipath_iba6120.c

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index e67e4a89fcc4fd46bddd0ee3cd2af6888120e023..9868ccda5f26769b66dc76593ef107a53a5630f2 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -435,16 +435,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
                        freeze_cnt++;
                        ipath_dbg("Clearing freezemode on ignored or recovered "
                                  "hardware error (%u)\n", freeze_cnt);
-                       /*
-                        * 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,
-                                        dd->ipath_control);
+                       ipath_clear_freeze(dd);
                }
        }