1 files changed, 8 insertions, 3 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index a45bd2124d6b..b6c69e1463e8 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1544,9 +1544,14 @@ int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
                 lladdr = tb[NDA_LLADDR] ? nla_data(tb[NDA_LLADDR]) : NULL;
 
                 if (ndm->ndm_flags & NTF_PROXY) {
-                        err = 0;
-                        if (pneigh_lookup(tbl, dst, dev, 1) == NULL)
-                                err = -ENOBUFS;
+                        struct pneigh_entry *pn;
+
+                        err = -ENOBUFS;
+                        pn = pneigh_lookup(tbl, dst, dev, 1);
+                        if (pn) {
+                                pn->flags = ndm->ndm_flags;
+                                err = 0;
+                        }
                         goto out_dev_put;
                 }