1 files changed, 17 insertions, 18 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 2f4e06a13457..23ae5e5426db 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2409,36 +2409,35 @@ static struct file_operations neigh_stat_seq_fops = {
 #endif /* CONFIG_PROC_FS */
 
 #ifdef CONFIG_ARPD
-void neigh_app_ns(struct neighbour *n)
+static void __neigh_notify(struct neighbour *n, int type, int flags)
 {
         struct sk_buff *skb;
+        int err = -ENOBUFS;
 
         skb = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
         if (skb == NULL)
-                return;
+                goto errout;
 
-        if (neigh_fill_info(skb, n, 0, 0, RTM_GETNEIGH, NLM_F_REQUEST) <= 0)
+        err = neigh_fill_info(skb, n, 0, 0, type, flags);
+        if (err < 0) {
                 kfree_skb(skb);
-        else {
-                NETLINK_CB(skb).dst_group  = RTNLGRP_NEIGH;
-                netlink_broadcast(rtnl, skb, 0, RTNLGRP_NEIGH, GFP_ATOMIC);
+                goto errout;
         }
+
+        err = rtnl_notify(skb, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);
+errout:
+        if (err < 0)
+                rtnl_set_sk_err(RTNLGRP_NEIGH, err);
 }
 
-static void neigh_app_notify(struct neighbour *n)
+void neigh_app_ns(struct neighbour *n)
 {
-        struct sk_buff *skb;
-
-        skb = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
-        if (skb == NULL)
-                return;
+        __neigh_notify(n, RTM_GETNEIGH, NLM_F_REQUEST);
+}
 
-        if (neigh_fill_info(skb, n, 0, 0, RTM_NEWNEIGH, 0) <= 0)
-                kfree_skb(skb);
-        else {
-                NETLINK_CB(skb).dst_group  = RTNLGRP_NEIGH;
-                netlink_broadcast(rtnl, skb, 0, RTNLGRP_NEIGH, GFP_ATOMIC);
-        }
+static void neigh_app_notify(struct neighbour *n)
+{
+        __neigh_notify(n, RTM_NEWNEIGH, 0);
 }
 
 #endif /* CONFIG_ARPD */