提交 af9a9976 编写于 作者: Y YOSHIFUJI Hideaki / 吉藤英明 提交者: David S. Miller

ndisc: Remove dev argument for ndisc_send_skb().

Since we have skb->dev, use it.
Signed-off-by: NYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f382d03a
...@@ -463,14 +463,14 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev, ...@@ -463,14 +463,14 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev,
return skb; return skb;
} }
static void ndisc_send_skb(struct sk_buff *skb, struct net_device *dev, 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 icmp6hdr *icmp6h)
{ {
struct flowi6 fl6; struct flowi6 fl6;
struct dst_entry *dst; struct dst_entry *dst;
struct net *net = dev_net(dev); struct net *net = dev_net(skb->dev);
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;
...@@ -478,8 +478,8 @@ static void ndisc_send_skb(struct sk_buff *skb, struct net_device *dev, ...@@ -478,8 +478,8 @@ static void ndisc_send_skb(struct sk_buff *skb, struct net_device *dev,
type = icmp6h->icmp6_type; type = icmp6h->icmp6_type;
icmpv6_flow_init(sk, &fl6, type, saddr, daddr, dev->ifindex); icmpv6_flow_init(sk, &fl6, type, saddr, daddr, skb->dev->ifindex);
dst = icmp6_dst_alloc(dev, &fl6); dst = icmp6_dst_alloc(skb->dev, &fl6);
if (IS_ERR(dst)) { if (IS_ERR(dst)) {
kfree_skb(skb); kfree_skb(skb);
return; return;
...@@ -516,7 +516,7 @@ static void __ndisc_send(struct net_device *dev, ...@@ -516,7 +516,7 @@ static void __ndisc_send(struct net_device *dev,
if (!skb) if (!skb)
return; return;
ndisc_send_skb(skb, dev, daddr, saddr, icmp6h); ndisc_send_skb(skb, daddr, saddr, icmp6h);
} }
static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册