Re: [PATCH] net: Move destructor from neigh->ops to neigh_params
From: Roland Dreier <hidden>
Date: 2006-03-07 05:44:50
Subsystem:
atm, networking [general], the rest · Maintainers:
Chas Williams, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Roland> struct neigh_ops currently has a destructor field, which
Roland> no in-kernel drivers outside of infiniband use.
Andrew> net/atm/clip.c begs to disagree.
err... my fault for trusting the patch changelog and not
double-checking. I think the fix is as simple as, although, given my
lack of ATM gear, this is untested:
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 73370de..9d72817 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c@@ -289,7 +289,6 @@ static void clip_neigh_error(struct neig static struct neigh_ops clip_neigh_ops = { .family = AF_INET, - .destructor = clip_neigh_destroy, .solicit = clip_neigh_solicit, .error_report = clip_neigh_error, .output = dev_queue_xmit,
@@ -346,6 +345,7 @@ static struct neigh_table clip_tbl = { /* parameters are copied from ARP ... */ .parms = { + .destructor = clip_neigh_destroy, .tbl = &clip_tbl, .base_reachable_time = 30 * HZ, .retrans_time = 1 * HZ,