NoaSoftware
/
TencentOS-kernel
forked from TencentOS/TencentOS-kernel
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: icmp: introduce function icmpv6_param_prob_reason() 

[upstream commit 1ad6d548e2a452f21bcee4606ee4ec7afcde5f37]

In order to add the skb drop reasons support to icmpv6_param_prob(),
introduce the function icmpv6_param_prob_reason() and make
icmpv6_param_prob() an inline call to it. This new function will be
used in the following patches.

Signed-off-by: Menglong Dong <imagedong@tencent.com>
Reviewed-by: Jiang Biao <benbjiang@tencent.com>
Reviewed-by: Hao Peng <flyingpeng@tencent.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Menglong Dong 2022-06-07 11:05:54 +08:00
parent 4ad7c174b5
commit 4fc2182cfa
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/icmpv6.h
View File

@ -79,8 +79,9 @@ extern int icmpv6_init(void);
extern int icmpv6_err_convert(u8 type, u8 code,
int *err);
extern void icmpv6_cleanup(void);
extern void icmpv6_param_prob(struct sk_buff *skb,
u8 code, int pos);
extern void icmpv6_param_prob_reason(struct sk_buff *skb,
u8 code, int pos,
enum skb_drop_reason reason);
struct flowi6;
struct in6_addr;
@ -90,4 +91,11 @@ extern void icmpv6_flow_init(struct sock *sk,
const struct in6_addr *saddr,
const struct in6_addr *daddr,
int oif);
static inline void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)
{
icmpv6_param_prob_reason(skb, code, pos,
SKB_DROP_REASON_NOT_SPECIFIED);
}
#endif

7
net/ipv6/icmp.c
View File

@ -602,12 +602,13 @@ out_bh_enable:
}
EXPORT_SYMBOL(icmp6_send);
/* Slightly more convenient version of icmp6_send.
/* Slightly more convenient version of icmp6_send with drop reasons.
*/
void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)
void icmpv6_param_prob_reason(struct sk_buff *skb, u8 code, int pos,
enum skb_drop_reason reason)
{
icmp6_send(skb, ICMPV6_PARAMPROB, code, pos, NULL, IP6CB(skb));
kfree_skb(skb);
kfree_skb_reason(skb, reason);
}
/* Generate icmpv6 with type/code ICMPV6_DEST_UNREACH/ICMPV6_ADDR_UNREACH