From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Mon, 21 Jan 2013 06:48:58 +0000 (+0000)
Subject: ndisc: Remove icmp6h argument from ndisc_send_skb().
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aa4bdd4b3f43274252c1280f6464850b0f004fc8;p=linux-beck.git

ndisc: Remove icmp6h argument from ndisc_send_skb().

skb_transport_header() (thus icmp6_hdr()) is available here,
use it.

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 ed786441bc51..f0c436b49255 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -465,8 +465,7 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev,
 
 static void ndisc_send_skb(struct sk_buff *skb,
 			   const struct in6_addr *daddr,
-			   const struct in6_addr *saddr,
-			   struct icmp6hdr *icmp6h)
+			   const struct in6_addr *saddr)
 {
 	struct flowi6 fl6;
 	struct dst_entry *dst;
@@ -474,6 +473,7 @@ static void ndisc_send_skb(struct sk_buff *skb,
 	struct sock *sk = net->ipv6.ndisc_sk;
 	struct inet6_dev *idev;
 	int err;
+	struct icmp6hdr *icmp6h = icmp6_hdr(skb);
 	u8 type;
 
 	type = icmp6h->icmp6_type;
@@ -516,7 +516,7 @@ static void __ndisc_send(struct net_device *dev,
 	if (!skb)
 		return;
 
-	ndisc_send_skb(skb, daddr, saddr, icmp6h);
+	ndisc_send_skb(skb, daddr, saddr);
 }
 
 static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,