From 95fda94920dd34778f4c61b7c31683a827777cde Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 2 May 2007 15:31:12 +0300 Subject: [PATCH] --- yaml --- r: 54389 b: refs/heads/master c: d6ef7d68f6f51c5b9de01c542dab8b90067a9c27 h: refs/heads/master i: 54387: bc7da5cc501e218bd0bb945c9f5097b3ef3e031b v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9e84c5bc64df..385ae767aec6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aff9e39d97585486764572ab2f3bf5dfce18c660 +refs/heads/master: d6ef7d68f6f51c5b9de01c542dab8b90067a9c27 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 76717410660e..1e27930077e6 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -370,7 +370,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) if (!likely(wr_id & IPOIB_CM_RX_UPDATE_MASK)) { p = wc->qp->qp_context; - if (time_after_eq(jiffies, p->jiffies + IPOIB_CM_RX_UPDATE_TIME)) { + if (p && time_after_eq(jiffies, p->jiffies + IPOIB_CM_RX_UPDATE_TIME)) { spin_lock_irqsave(&priv->lock, flags); p->jiffies = jiffies; /* Move this entry to list head, but do