aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/icmp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 065997f414e6..3f24414150e2 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -570,7 +570,8 @@ relookup_failed:
570 * MUST reply to only the first fragment. 570 * MUST reply to only the first fragment.
571 */ 571 */
572 572
573void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) 573void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
574 const struct ip_options *opt)
574{ 575{
575 struct iphdr *iph; 576 struct iphdr *iph;
576 int room; 577 int room;
@@ -691,7 +692,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
691 iph->tos; 692 iph->tos;
692 mark = IP4_REPLY_MARK(net, skb_in->mark); 693 mark = IP4_REPLY_MARK(net, skb_in->mark);
693 694
694 if (ip_options_echo(net, &icmp_param.replyopts.opt.opt, skb_in)) 695 if (__ip_options_echo(net, &icmp_param.replyopts.opt.opt, skb_in, opt))
695 goto out_unlock; 696 goto out_unlock;
696 697
697 698
@@ -742,7 +743,7 @@ out_bh_enable:
742 local_bh_enable(); 743 local_bh_enable();
743out:; 744out:;
744} 745}
745EXPORT_SYMBOL(icmp_send); 746EXPORT_SYMBOL(__icmp_send);
746 747
747 748
748static void icmp_socket_deliver(struct sk_buff *skb, u32 info) 749static void icmp_socket_deliver(struct sk_buff *skb, u32 info)