ndisc: Break down __ndisc_send().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index dda4addf291934340c3b273388b0dcdac9d8bb6f..79a56a7663b7e634dcabbe900596ffe355a64209 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -503,29 +503,12 @@ static void ndisc_send_skb(struct sk_buff *skb,
        rcu_read_unlock();
 }
 
-/*
- *     Send a Neighbour Discover packet
- */
-static void __ndisc_send(struct net_device *dev,
-                        const struct in6_addr *daddr,
-                        const struct in6_addr *saddr,
-                        struct icmp6hdr *icmp6h, const struct in6_addr *target,
-                        int llinfo)
-{
-       struct sk_buff *skb;
-
-       skb = ndisc_build_skb(dev, daddr, saddr, icmp6h, target, llinfo);
-       if (!skb)
-               return;
-
-       ndisc_send_skb(skb, daddr, saddr);
-}
-
 static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
                          const struct in6_addr *daddr,
                          const struct in6_addr *solicited_addr,
                          bool router, bool solicited, bool override, bool inc_opt)
 {
+       struct sk_buff *skb;
        struct in6_addr tmpaddr;
        struct inet6_ifaddr *ifp;
        const struct in6_addr *src_addr;
@@ -553,8 +536,12 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
        icmp6h.icmp6_solicited = solicited;
        icmp6h.icmp6_override = override;
 
-       __ndisc_send(dev, daddr, src_addr, &icmp6h, solicited_addr,
-                    inc_opt ? ND_OPT_TARGET_LL_ADDR : 0);
+       skb = ndisc_build_skb(dev, daddr, src_addr, &icmp6h, solicited_addr,
+                             inc_opt ? ND_OPT_TARGET_LL_ADDR : 0);
+       if (!skb)
+               return;
+
+       ndisc_send_skb(skb, daddr, src_addr);
 }
 
 static void ndisc_send_unsol_na(struct net_device *dev)
@@ -582,6 +569,7 @@ void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh,
                   const struct in6_addr *solicit,
                   const struct in6_addr *daddr, const struct in6_addr *saddr)
 {
+       struct sk_buff *skb;
        struct in6_addr addr_buf;
        struct icmp6hdr icmp6h = {
                .icmp6_type = NDISC_NEIGHBOUR_SOLICITATION,
@@ -594,13 +582,18 @@ void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh,
                saddr = &addr_buf;
        }
 
-       __ndisc_send(dev, daddr, saddr, &icmp6h, solicit,
-                    !ipv6_addr_any(saddr) ? ND_OPT_SOURCE_LL_ADDR : 0);
+       skb = ndisc_build_skb(dev, daddr, saddr, &icmp6h, solicit,
+                             !ipv6_addr_any(saddr) ? ND_OPT_SOURCE_LL_ADDR : 0);
+       if (!skb)
+               return;
+
+       ndisc_send_skb(skb, daddr, saddr);
 }
 
 void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
                   const struct in6_addr *daddr)
 {
+       struct sk_buff *skb;
        struct icmp6hdr icmp6h = {
                .icmp6_type = NDISC_ROUTER_SOLICITATION,
        };
@@ -628,8 +621,12 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
                }
        }
 #endif
-       __ndisc_send(dev, daddr, saddr, &icmp6h, NULL,
-                    send_sllao ? ND_OPT_SOURCE_LL_ADDR : 0);
+       skb = ndisc_build_skb(dev, daddr, saddr, &icmp6h, NULL,
+                             send_sllao ? ND_OPT_SOURCE_LL_ADDR : 0);
+       if (!skb)
+               return;
+
+       ndisc_send_skb(skb, daddr, saddr);
 }