iproute2 already defines a structure with that name, let's use another one to avoid any conflict.
Showing the changes to include/uapi/linux (1 of 5 files). Show all
Unified · Split
| @@ -299,7 +299,7 @@ enum xfrm_attr_type_t { · 298 unmodified lines | |||
| 299 | XFRMA_REPLAY_ESN_VAL, /* struct xfrm_replay_esn */ | 299 | XFRMA_REPLAY_ESN_VAL, /* struct xfrm_replay_esn */ |
| 300 | XFRMA_SA_EXTRA_FLAGS, /* __u32 */ | 300 | XFRMA_SA_EXTRA_FLAGS, /* __u32 */ |
| 301 | XFRMA_PROTO, /* __u8 */ | 301 | XFRMA_PROTO, /* __u8 */ |
| 302 | XFRMA_FILTER, /* struct xfrm_filter */ | 302 | XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */ |
| 303 | __XFRMA_MAX | 303 | __XFRMA_MAX |
| 304 | 304 | ||
| 305 | #define XFRMA_MAX (__XFRMA_MAX - 1) | 305 | #define XFRMA_MAX (__XFRMA_MAX - 1) |
| @@ -476,7 +476,7 @@ struct xfrm_user_mapping { · 170 unmodified lines | |||
| 476 | __be16 new_sport; | 476 | __be16 new_sport; |
| 477 | }; | 477 | }; |
| 478 | 478 | ||
| 479 | struct xfrm_filter { | 479 | struct xfrm_address_filter { |
| 480 | xfrm_address_t saddr; | 480 | xfrm_address_t saddr; |
| 481 | xfrm_address_t daddr; | 481 | xfrm_address_t daddr; |
| 482 | __u16 family; | 482 | __u16 family; |