hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
YOSHIFUJI Hideaki / 吉藤英明 2013-01-21 06:48:58 +00:00 committed by David S. Miller
parent 5f5a011563
commit aa4bdd4b3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv6/ndisc.c
View File

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