ipv6: Unshare ip6_nd_hdr() and change return type to void.

- move ip6_nd_hdr() to its users' source files.
  In net/ipv6/mcast.c, it will be called ip6_mc_hdr().
- make return type to void since this function never fails.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 1776a0deee7f..7ce266f34cc7 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -389,6 +389,31 @@ static struct sk_buff *ndisc_alloc_skb(struct net_device *dev,
         return skb;
 }
 
+static void ip6_nd_hdr(struct sock *sk,
+                       struct sk_buff *skb, struct net_device *dev,
+                       const struct in6_addr *saddr,
+                       const struct in6_addr *daddr,
+                       int proto, int len)
+{
+        struct ipv6hdr *hdr;
+
+        skb->protocol = htons(ETH_P_IPV6);
+        skb->dev = dev;
+
+        skb_reset_network_header(skb);
+        skb_put(skb, sizeof(struct ipv6hdr));
+        hdr = ipv6_hdr(skb);
+
+        ip6_flow_hdr(hdr, 0, 0);
+
+        hdr->payload_len = htons(len);
+        hdr->nexthdr = proto;
+        hdr->hop_limit = inet6_sk(sk)->hop_limit;
+
+        hdr->saddr = *saddr;
+        hdr->daddr = *daddr;
+}
+
 static struct sk_buff *ndisc_build_skb(struct net_device *dev,
                                        const struct in6_addr *daddr,
                                        const struct in6_addr *saddr,