projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[powerpc.git]
/
drivers
/
infiniband
/
core
/
addr.c
diff --git
a/drivers/infiniband/core/addr.c
b/drivers/infiniband/core/addr.c
index
af93979
..
d2bb5a9
100644
(file)
--- 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);
}
}