diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-19 15:04:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-19 15:04:41 -0500 |
| commit | 447f219190bf0368b8b36cf60155744cb43510df (patch) | |
| tree | 7e6c95b20ea8fe8f819fceb7399602df72061c48 /include | |
| parent | 72be84f1c21c0ddba1081291072d7acc9ccddf5f (diff) | |
| download | linux-447f219190bf0368b8b36cf60155744cb43510df.tar.bz2 | |
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.h | 1 | ||||
| -rw-r--r-- | include/net/neighbour.h | 1 |
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 { int (*ndo_set_features)(struct net_device *dev, netdev_features_t features); int (*ndo_neigh_construct)(struct neighbour *n); + void (*ndo_neigh_destroy)(struct neighbour *n); }; /* 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 { #endif struct net_device *dev; struct neigh_parms *next; + int (*neigh_setup)(struct neighbour *); void (*neigh_cleanup)(struct neighbour *); struct neigh_table *tbl; |