2 files changed, 3 insertions, 6 deletions

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index ffded64dcbeb..d17b72763973 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -96,7 +96,6 @@ enum {
         TIMERTICK = HZ / 10,
         MINTIMER = HZ >> 2,
         MAXTIMER = HZ << 1,
-        HELPWAIT = 20,
 };
 
 struct buf {
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index bbab40c8d67c..e3291dfa7607 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -633,11 +633,9 @@ rexmit_timer(ulong vp)
                 list_del(pos);
 
                 t = f->t;
-                if (n > HELPWAIT) {
-                        /* see if another target can help */
-                        if (d->ntargets > 1)
-                                d->htgt = t;
-                }
+                if (n > aoe_deadsecs/2)
+                        d->htgt = t; /* see if another target can help */
+
                 if (t->nout == t->maxout) {
                         if (t->maxout > 1)
                                 t->maxout--;