diff options
| -rw-r--r-- | include/libipset/linux_ip_set.h | 2 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 4 | ||||
| -rw-r--r-- | kernel/include/uapi/linux/netfilter/ipset/ip_set.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h index 63b2e34..def91b9 100644 --- a/include/libipset/linux_ip_set.h +++ b/include/libipset/linux_ip_set.h @@ -263,7 +263,7 @@ struct ip_set_counter_match0 { }; struct ip_set_counter_match { - __aligned_u64 value; + __u64 __attribute__((aligned(8))) value; __u8 op; }; diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index 9c405df..15d0763 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -271,10 +271,6 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype, #define smp_mb__after_atomic() smp_mb() #endif -#ifndef __aligned_u64 -#define __aligned_u64 __u64 -#endif - #ifndef pr_warn #define pr_warn pr_warning #endif diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h index 63b2e34..def91b9 100644 --- a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h @@ -263,7 +263,7 @@ struct ip_set_counter_match0 { }; struct ip_set_counter_match { - __aligned_u64 value; + __u64 __attribute__((aligned(8))) value; __u8 op; }; |