Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300433
b: refs/heads/master
c: a2d91a0
h: refs/heads/master
i:
  300431: daf76c6
v: v3
  • Loading branch information
Eldad Zack authored and David S. Miller committed Apr 2, 2012
1 parent 1a1e24d commit 2ebb463
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 911c8541efc78014b29d44510be4d6d4c9d539da
refs/heads/master: a2d91a09dac71bf34a9a3e4b8fdda36f02788b52
5 changes: 2 additions & 3 deletions trunk/net/ipv6/icmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
err = ip6_append_data(sk, icmpv6_getfrag, &msg,
len + sizeof(struct icmp6hdr),
sizeof(struct icmp6hdr), hlimit,
np->tclass, NULL, &fl6, (struct rt6_info*)dst,
np->tclass, NULL, &fl6, (struct rt6_info *)dst,
MSG_DONTWAIT, np->dontfrag);
if (err) {
ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTERRORS);
Expand Down Expand Up @@ -580,7 +580,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)

err = ip6_append_data(sk, icmpv6_getfrag, &msg, skb->len + sizeof(struct icmp6hdr),
sizeof(struct icmp6hdr), hlimit, np->tclass, NULL, &fl6,
(struct rt6_info*)dst, MSG_DONTWAIT,
(struct rt6_info *)dst, MSG_DONTWAIT,
np->dontfrag);

if (err) {
Expand Down Expand Up @@ -951,7 +951,6 @@ int icmpv6_err_convert(u8 type, u8 code, int *err)

return fatal;
}

EXPORT_SYMBOL(icmpv6_err_convert);

#ifdef CONFIG_SYSCTL
Expand Down

0 comments on commit 2ebb463

Please sign in to comment.