| Message ID | 1393857367-15016-2-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On Mon, 3 Mar 2014 15:36:06 +0100 Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- Sigh. couldn't you have chosen another variable name. As it is new kernel headers with old iproute2 source will break. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le 05/03/2014 02:03, Stephen Hemminger a écrit : > On Mon, 3 Mar 2014 15:36:06 +0100 > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> --- > > Sigh. couldn't you have chosen another variable name. > As it is new kernel headers with old iproute2 source will break. > I noticed this after finishing the kernel part. I have not thought about this because kernel headers are embedded in iproute2. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 341c3c951dac..694aa90df7d8 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -298,6 +298,8 @@ enum xfrm_attr_type_t { XFRMA_TFCPAD, /* __u32 */ XFRMA_REPLAY_ESN_VAL, /* struct xfrm_replay_esn */ XFRMA_SA_EXTRA_FLAGS, /* __u32 */ + XFRMA_PROTO, /* __u8 */ + XFRMA_FILTER, /* struct xfrm_filter */ __XFRMA_MAX #define XFRMA_MAX (__XFRMA_MAX - 1) @@ -474,6 +476,14 @@ struct xfrm_user_mapping { __be16 new_sport; }; +struct xfrm_filter { + xfrm_address_t saddr; + xfrm_address_t daddr; + __u16 family; + __u8 splen; + __u8 dplen; +}; + /* backwards compatibility for userspace */ #define XFRMGRP_ACQUIRE 1 #define XFRMGRP_EXPIRE 2
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Note that this patch is based on net-next. include/linux/xfrm.h | 10 ++++++++++ 1 file changed, 10 insertions(+)