From 6085e6773cabe15d2274bbce786824a7dfb2493a Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Wed, 16 Apr 2008 21:09:28 -0700 Subject: [PATCH] --- yaml --- r: 88518 b: refs/heads/master c: b3b8128fd3b0966830ee90f1162173d07cb496a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_mad.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7b3047ddd1c3..372fe1794a4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f438000f7a31fad7cfd27f33ad324a250f4cd2df +refs/heads/master: b3b8128fd3b0966830ee90f1162173d07cb496a0 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_mad.c b/trunk/drivers/infiniband/hw/ipath/ipath_mad.c index 30b2f44406b1..babcc09c832c 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_mad.c @@ -1397,7 +1397,8 @@ static int process_subn(struct ib_device *ibdev, int mad_flags, } /* Is the mkey in the process of expiring? */ - if (dev->mkey_lease_timeout && jiffies >= dev->mkey_lease_timeout) { + if (dev->mkey_lease_timeout && + time_after_eq(jiffies, dev->mkey_lease_timeout)) { /* Clear timeout and mkey protection field. */ dev->mkey_lease_timeout = 0; dev->mkeyprot = 0;