aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-19 15:04:41 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-19 15:04:41 -0500
commit447f219190bf0368b8b36cf60155744cb43510df (patch)
tree7e6c95b20ea8fe8f819fceb7399602df72061c48 /include
parent72be84f1c21c0ddba1081291072d7acc9ccddf5f (diff)
Revert "net: Remove unused neighbour layer ops."
This reverts commit 5c3ddec73d01a1fae9409c197078cb02c42238c3. S390 qeth driver actually still uses the setup ops. Reported-by: Frank Blaschka <blaschka@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netdevice.h1
-rw-r--r--include/net/neighbour.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 6b9d4edb7c26..603730804da5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -974,6 +974,7 @@ struct net_device_ops {
974 int (*ndo_set_features)(struct net_device *dev, 974 int (*ndo_set_features)(struct net_device *dev,
975 netdev_features_t features); 975 netdev_features_t features);
976 int (*ndo_neigh_construct)(struct neighbour *n); 976 int (*ndo_neigh_construct)(struct neighbour *n);
977 void (*ndo_neigh_destroy)(struct neighbour *n);
977}; 978};
978 979
979/* 980/*
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 6814c4d61c1c..e31f0a86f9b7 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -43,6 +43,7 @@ struct neigh_parms {
43#endif 43#endif
44 struct net_device *dev; 44 struct net_device *dev;
45 struct neigh_parms *next; 45 struct neigh_parms *next;
46 int (*neigh_setup)(struct neighbour *);
46 void (*neigh_cleanup)(struct neighbour *); 47 void (*neigh_cleanup)(struct neighbour *);
47 struct neigh_table *tbl; 48 struct neigh_table *tbl;
48 49