diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-18 08:25:24 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-18 14:30:17 -0800 |
| commit | 3ffe533c87281b68d469b279ff3a5056f9c75862 (patch) | |
| tree | 456d4c8c877e937fd4919e4c30c75a7bb9f6651f /net/ipv6/udp.c | |
| parent | bbef49daca35d4fd21bf606a10b6980f17d9df5d (diff) | |
| download | linux-3.10-3ffe533c87281b68d469b279ff3a5056f9c75862.tar.gz linux-3.10-3ffe533c87281b68d469b279ff3a5056f9c75862.tar.bz2 linux-3.10-3ffe533c87281b68d469b279ff3a5056f9c75862.zip | |
ipv6: drop unused "dev" arg of icmpv6_send()
Dunno, what was the idea, it wasn't used for a long time.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index a7af9d68cd6..52b8347ae3b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -680,12 +680,11 @@ static inline int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, int proto) { + struct net *net = dev_net(skb->dev); struct sock *sk; struct udphdr *uh; - struct net_device *dev = skb->dev; struct in6_addr *saddr, *daddr; u32 ulen = 0; - struct net *net = dev_net(skb->dev); if (!pskb_may_pull(skb, sizeof(struct udphdr))) goto short_packet; @@ -744,7 +743,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); - icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); + icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0); kfree_skb(skb); return 0; |