neigh: allow admin to set NUD_STALE
authorJulian Anastasov <ja@ssi.bg>
Wed, 27 Jul 2016 06:56:50 +0000 (09:56 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Aug 2016 22:36:38 +0000 (15:36 -0700)
Admin should be able to set any state. Currently, this fails
when lladdr is not changed and state is changed from
NUD_CONNECTED to NUD_STALE:

ip neigh add 192.168.8.1 lladdr 00:11:22:33:44:55 nud perm dev wlan0
ip neigh show to 192.168.8.1
192.168.8.1 dev wlan0 lladdr 00:11:22:33:44:55 PERMANENT
ip neigh change 192.168.8.1 lladdr 00:11:22:33:44:55 nud stale dev wlan0
ip neigh show to 192.168.8.1
192.168.8.1 dev wlan0 lladdr 00:11:22:33:44:55 PERMANENT

Problem may be from 2.1.X days.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Reviewed-by: Chunhui He <hchunhui@mail.ustc.edu.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/neighbour.c

index cf26e04c4046ded822a1e449e5a6c036ca2af38e..2ae929f9bd06f3be98cbd1add881641a0df1d7a4 100644 (file)
@@ -1148,7 +1148,8 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
                        } else
                                goto out;
                } else {
-                       if (lladdr == neigh->ha && new == NUD_STALE)
+                       if (lladdr == neigh->ha && new == NUD_STALE &&
+                           !(flags & NEIGH_UPDATE_F_ADMIN))
                                new = old;
                }
        }