From 16b1f299f8f734a82ce86fc0e17312372fa8fa33 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 1 Dec 2011 14:16:04 -0500 Subject: [PATCH] --- yaml --- r: 278321 b: refs/heads/master c: 65698610f58153eb7621be3fb4f57ca318b19c60 h: refs/heads/master i: 278319: bac4b761d9030b6672583b06c411bf23bcd10e5e v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f70d7edba948..f5015a0a1f83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84f9307c5da84a7c8513e7607dc8427d2cbd63e3 +refs/heads/master: 65698610f58153eb7621be3fb4f57ca318b19c60 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 1c4ddb37f2b5..21440e31fdab 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -975,7 +975,7 @@ struct net_device_ops { int (*ndo_set_features)(struct net_device *dev, netdev_features_t features); int (*ndo_neigh_construct)(struct neighbour *n); - int (*ndo_neigh_destroy)(struct neighbour *n); + void (*ndo_neigh_destroy)(struct neighbour *n); }; /*