neighbour: remove neigh_cleanup() method

commit f394722fb0d0f701119368959d7cd0ecbc46363a upstream.

neigh_cleanup() has not been used for seven years, and was a wrong design.

Messing with shared pointer in bond_neigh_init() without proper
memory barriers would at least trigger syzbot complains eventually.

It is time to remove this stuff.

Fixes: b63b70d87741 ("IPoIB: Use a private hash table for path lookup in xmit path")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 98f9fd6e37b63fadf17ff403b0dba4fde0ec3c2f..3a270d0275a53a9e00c1cac4168645f2e3a5b0c5 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3431,19 +3431,10 @@ static int bond_neigh_init(struct neighbour *n)
                return 0;
 
        parms.neigh_setup = NULL;
-       parms.neigh_cleanup = NULL;
        ret = slave_ops->ndo_neigh_setup(slave->dev, &parms);
        if (ret)
                return ret;
 
-       /*
-        * Assign slave's neigh_cleanup to neighbour in case cleanup is called
-        * after the last slave has been detached.  Assumes that all slaves
-        * utilize the same neigh_cleanup (true at this writing as only user
-        * is ipoib).
-        */
-       n->parms->neigh_cleanup = parms.neigh_cleanup;
-
        if (!parms.neigh_setup)
                return 0;
 

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 47f425464f847fd827719ac5da99cf2749824a14..c24981a8d1a84dfbdcbebedf45193c0814122cd3 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -71,7 +71,6 @@ struct neigh_parms {
        struct net_device *dev;
        struct neigh_parms *next;
        int     (*neigh_setup)(struct neighbour *);
-       void    (*neigh_cleanup)(struct neighbour *);
        struct neigh_table *tbl;
 
        void    *sysctl_table;

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 9137f30c78b8f0a61a3d630473efd9e06eff2147..e48e552be9fe563afa039261bffd0fd28abccc76 100644 (file)
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -103,9 +103,6 @@ static int neigh_blackhole(struct neighbour *neigh, struct sk_buff *skb)
 
 static void neigh_cleanup_and_release(struct neighbour *neigh)
 {
-       if (neigh->parms->neigh_cleanup)
-               neigh->parms->neigh_cleanup(neigh);
-
        __neigh_notify(neigh, RTM_DELNEIGH, 0);
        neigh_release(neigh);
 }