]> granicus.if.org Git - ipset/commitdiff
xt_set: avoid user types in exported kernel headers
authorJan Engelhardt <jengelh@medozas.de>
Sun, 19 Dec 2010 01:27:53 +0000 (02:27 +0100)
committerJan Engelhardt <jengelh@medozas.de>
Sun, 19 Dec 2010 02:05:59 +0000 (03:05 +0100)
Within isolated code it would be ok, but not so in exported headers.

kernel/include/linux/netfilter/xt_set.h

index c6084dfda1da2392878f4ac748a5c7e59c07d7a4..69b2bd1fb818022d7bc16cd37bc9c98ff735c3f1 100644 (file)
 struct xt_set_info_v0 {
        ip_set_id_t index;
        union {
-               u_int32_t flags[IPSET_DIM_MAX + 1];
+               __u32 flags[IPSET_DIM_MAX + 1];
                struct {
-                       u_int32_t __flags[IPSET_DIM_MAX];
-                       u_int8_t dim;
-                       u_int8_t flags;
+                       __u32 __flags[IPSET_DIM_MAX];
+                       __u8 dim;
+                       __u8 flags;
                } compat;
        } u;
 };
@@ -38,8 +38,8 @@ struct xt_set_info_target_v0 {
 
 struct xt_set_info {
        ip_set_id_t index;
-       u_int8_t dim;
-       u_int8_t flags;
+       __u8 dim;
+       __u8 flags;
 };
 
 /* match and target infos */