Fix __aligned_u64 compatibility support for older kernel releases

The issue was reported by Mart Frauenlob.

diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h
index 63b2e34f1b60393b9593513f899d3243055c1e7e..def91b9d308457a5b1ee9d2eafb5fe79c7af3fe1 100644 (file)
--- 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 9c405dfbf07c07cc913ff28052406327b6f7d263..15d076376e1817e92495028334830a6abbb077ec 100644 (file)
--- 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 63b2e34f1b60393b9593513f899d3243055c1e7e..def91b9d308457a5b1ee9d2eafb5fe79c7af3fe1 100644 (file)
--- 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;
 };