From 51432a08e29332c4292cd12a89bde07c1a48fff2 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 20 Mar 2006 22:30:23 -0800 Subject: [PATCH] --- yaml --- r: 22264 b: refs/heads/master c: aa837b5bbd92ca3791345e809d0027594faa738b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/atm/clip.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d7fcfc988f7..cb88cdc1d901 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9e678006ee865b0f7e53069b0e519141a710a6e +refs/heads/master: aa837b5bbd92ca3791345e809d0027594faa738b diff --git a/trunk/net/atm/clip.c b/trunk/net/atm/clip.c index 73370de97539..3ab4e7947bab 100644 --- a/trunk/net/atm/clip.c +++ b/trunk/net/atm/clip.c @@ -289,7 +289,6 @@ static void clip_neigh_error(struct neighbour *neigh,struct sk_buff *skb) 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, @@ -347,6 +346,7 @@ static struct neigh_table clip_tbl = { /* parameters are copied from ARP ... */ .parms = { .tbl = &clip_tbl, + .neigh_destructor = clip_neigh_destroy, .base_reachable_time = 30 * HZ, .retrans_time = 1 * HZ, .gc_staletime = 60 * HZ,