diff options
| author | Nazarov Sergey <s-nazarov@yandex.ru> | 2019-02-25 19:24:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-25 14:32:35 -0800 |
| commit | 9ef6b42ad6fd7929dd1b6092cb02014e382c6a91 (patch) | |
| tree | bba7fa4852c9b5853eb7a89cf8743ef9440165af | |
| parent | ecef67cb10db7b83b3b71c61dbb29aa070ab0112 (diff) | |
| download | kernel_replicant_linux-9ef6b42ad6fd7929dd1b6092cb02014e382c6a91.tar.gz kernel_replicant_linux-9ef6b42ad6fd7929dd1b6092cb02014e382c6a91.tar.bz2 kernel_replicant_linux-9ef6b42ad6fd7929dd1b6092cb02014e382c6a91.zip | |
net: Add __icmp_send helper.
Add __icmp_send function having ip_options struct parameter
Signed-off-by: Sergey Nazarov <s-nazarov@yandex.ru>
Reviewed-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/icmp.h | 9 | ||||
| -rw-r--r-- | net/ipv4/icmp.c | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/net/icmp.h b/include/net/icmp.h index 6ac3a5bd0117..e0f709d26dde 100644 --- a/include/net/icmp.h +++ b/include/net/icmp.h @@ -22,6 +22,7 @@ #include <net/inet_sock.h> #include <net/snmp.h> +#include <net/ip.h> struct icmp_err { int errno; @@ -39,7 +40,13 @@ struct net_proto_family; struct sk_buff; struct net; -void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info); +void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, + const struct ip_options *opt); +static inline void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) +{ + __icmp_send(skb_in, type, code, info, &IPCB(skb_in)->opt); +} + int icmp_rcv(struct sk_buff *skb); int icmp_err(struct sk_buff *skb, u32 info); int icmp_init(void); 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: * MUST reply to only the first fragment. */ -void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) +void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, + const struct ip_options *opt) { struct iphdr *iph; int room; @@ -691,7 +692,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) iph->tos; mark = IP4_REPLY_MARK(net, skb_in->mark); - if (ip_options_echo(net, &icmp_param.replyopts.opt.opt, skb_in)) + if (__ip_options_echo(net, &icmp_param.replyopts.opt.opt, skb_in, opt)) goto out_unlock; @@ -742,7 +743,7 @@ out_bh_enable: local_bh_enable(); out:; } -EXPORT_SYMBOL(icmp_send); +EXPORT_SYMBOL(__icmp_send); static void icmp_socket_deliver(struct sk_buff *skb, u32 info) |