diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
| commit | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (patch) | |
| tree | eb80eebf368957df18c2a4c0ee02897e0a9b06d2 /drivers/infiniband/core/addr.c | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'drivers/infiniband/core/addr.c')
| -rw-r--r-- | drivers/infiniband/core/addr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index af939796750..d2bb5a9a303 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -360,8 +360,7 @@ static int netevent_callback(struct notifier_block *self, unsigned long event, if (event == NETEVENT_NEIGH_UPDATE) { struct neighbour *neigh = ctx; - if (neigh->dev->type == ARPHRD_INFINIBAND && - (neigh->nud_state & NUD_VALID)) { + if (neigh->nud_state & NUD_VALID) { set_timeout(jiffies); } } |