Merge branch 'linus'

1 files changed, 1 insertions, 1 deletions

diff --git a/net/atm/clip.c b/net/atm/clip.c
index 73370de97539..3ab4e7947bab 100644
--- a/net/atm/clip.c
+++ b/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,