Skip to content

Commit

Permalink
ndisc: Remove dev argument for ndisc_send_skb().
Browse files Browse the repository at this point in the history
Since we have skb->dev, use it.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
YOSHIFUJI Hideaki / 吉藤英明 authored and David S. Miller committed Jan 21, 2013
1 parent f382d03 commit af9a997
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions net/ipv6/ndisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,23 +463,23 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev,
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 *saddr,
struct icmp6hdr *icmp6h)
{
struct flowi6 fl6;
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 inet6_dev *idev;
int err;
u8 type;

type = icmp6h->icmp6_type;

icmpv6_flow_init(sk, &fl6, type, saddr, daddr, dev->ifindex);
dst = icmp6_dst_alloc(dev, &fl6);
icmpv6_flow_init(sk, &fl6, type, saddr, daddr, skb->dev->ifindex);
dst = icmp6_dst_alloc(skb->dev, &fl6);
if (IS_ERR(dst)) {
kfree_skb(skb);
return;
Expand Down Expand Up @@ -516,7 +516,7 @@ static void __ndisc_send(struct net_device *dev,
if (!skb)
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,
Expand Down

0 comments on commit af9a997

Please sign in to comment.