---

yaml --- r: 278321 b: refs/heads/master c: 6569861 h: refs/heads/master i: 278319: bac4b76 v: v3
git-mirror · Dec 1, 2011 · 16b1f29 · 16b1f29
1 parent c56fd7e
commit 16b1f29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 };
 
 /*