Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa4bdd4b authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ndisc: Remove icmp6h argument from ndisc_send_skb(). 



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

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f5a0115

net/ipv6/ndisc.c

+3 −3
Original line number Diff line number Diff line
@@ -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,