diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2022-09-30 09:49:33 +0200 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2022-09-30 09:49:33 +0200 |
commit | c39596f6ad1bfe65fc2d926e0703cf26e3fae90a (patch) | |
tree | d64aaa95393dd8e3ea2b01ba438078af9e6b9635 /include/net | |
parent | 48ff45dade87eb24a4d7ca28fd813ca2e2ebe745 (diff) | |
parent | 28b5dbd5dcf7659f64713c66eb7301924e070bf8 (diff) | |
download | linux-c39596f6ad1bfe65fc2d926e0703cf26e3fae90a.tar.gz |
Merge branch 'xfrm: add netlink extack to all the ->init_stat'
Sabrina Dubroca says:
============
This series completes extack support for state creation.
============
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ipcomp.h | 2 | ||||
-rw-r--r-- | include/net/xfrm.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h index c31108295079..8660a2a6d1fc 100644 --- a/include/net/ipcomp.h +++ b/include/net/ipcomp.h @@ -22,7 +22,7 @@ struct xfrm_state; int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb); int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb); void ipcomp_destroy(struct xfrm_state *x); -int ipcomp_init_state(struct xfrm_state *x); +int ipcomp_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack); static inline struct ip_comp_hdr *ip_comp_hdr(const struct sk_buff *skb) { diff --git a/include/net/xfrm.h b/include/net/xfrm.h index c504d07bcb7c..dbc81f5eb553 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -405,7 +405,8 @@ struct xfrm_type { #define XFRM_TYPE_LOCAL_COADDR 4 #define XFRM_TYPE_REMOTE_COADDR 8 - int (*init_state)(struct xfrm_state *x); + int (*init_state)(struct xfrm_state *x, + struct netlink_ext_ack *extack); void (*destructor)(struct xfrm_state *); int (*input)(struct xfrm_state *, struct sk_buff *skb); int (*output)(struct xfrm_state *, struct sk_buff *pskb); |