From a31fc4ec44b43ce97c8c3df3abe989b769f5a3c6 Mon Sep 17 00:00:00 2001 From: Dave Olson Date: Wed, 7 May 2008 10:57:48 -0700 Subject: [PATCH] --- yaml --- r: 96173 b: refs/heads/master c: b4d390d8d219452e5d4257c87134a6934d7fabeb h: refs/heads/master i: 96171: 3bac3af62e22cb0ba92c3a3fdef4f85417116b46 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_intr.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7ca0e319ab2e..f1e221776044 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e87d1500713767866db0668bbcec75719576f3c +refs/heads/master: b4d390d8d219452e5d4257c87134a6934d7fabeb diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_intr.c b/trunk/drivers/infiniband/hw/ipath/ipath_intr.c index 1b58f4737c71..45c4c068ab1e 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_intr.c @@ -933,11 +933,15 @@ void ipath_clear_freeze(struct ipath_devdata *dd) * therefore would not be sent, and eventually * might cause the process to run out of bufs */ - ipath_cancel_sends(dd, 0); + ipath_cancel_sends(dd, 1); ipath_write_kreg(dd, dd->ipath_kregs->kr_control, dd->ipath_control); - /* ensure pio avail updates continue */ + /* + * ensure pio avail updates continue (because the update + * won't have happened from cancel_sends because we were + * still in freeze + */ ipath_force_pio_avail_update(dd); /*