projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
net
/
atm
/
clip.c
diff --git
a/net/atm/clip.c
b/net/atm/clip.c
index
e07f551
..
53b4ac0
100644
(file)
--- a/
net/atm/clip.c
+++ b/
net/atm/clip.c
@@
-286,7
+286,7
@@
static const struct neigh_ops clip_neigh_ops = {
.connected_output = neigh_direct_output,
};
-static int clip_constructor(struct neighbour *neigh)
+static int clip_constructor(struct ne
t_device *dev, struct ne
ighbour *neigh)
{
struct atmarp_entry *entry = neighbour_priv(neigh);