Hi David,
Today's linux-next merge of the net tree got conflicts in
include/linux/netfilter/xt_limit.h and
include/linux/netfilter/xt_statistic.h between commit
cf7ea4cbd015402cc6e7204962c978a3b052ecd2 ("make netfilter use strict
integer types") from the tip-core tree and commit
acc738fec03bdaa5b77340c32a82fbfedaaabef0 ("netfilter: xtables: avoid
pointer to self") from the net tree.
I fixed them up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc include/linux/netfilter/xt_limit.h
index 190e98b,fda222c..0000000
--- a/include/linux/netfilter/xt_limit.h
+++ b/include/linux/netfilter/xt_limit.h
@@@ -9,15 -9,14 +11,14 @@@ struct xt_limit_priv
/* 1/10,000 sec period => max of 10,000/sec. Min rate is then 429490
seconds, or one every 59 hours. */
struct xt_rateinfo {
- u_int32_t avg; /* Average secs between packets * scale */
- u_int32_t burst; /* Period multiplier for upper limit. */
+ __u32 avg; /* Average secs between packets * scale */
+ __u32 burst; /* Period multiplier for upper limit. */
/* Used internally by the kernel */
- unsigned long prev;
- __u32 credit;
+ unsigned long prev; /* moved to xt_limit_priv */
- u_int32_t credit; /* moved to xt_limit_priv */
- u_int32_t credit_cap, cost;
++ __u32 credit; /* moved to xt_limit_priv */
+ __u32 credit_cap, cost;
- /* Ugly, ugly fucker. */
- struct xt_rateinfo *master;
+ struct xt_limit_priv *master;
};
#endif /*_XT_RATE_H*/
diff --cc include/linux/netfilter/xt_statistic.h
index 095f3c6,8f521ab..0000000
--- a/include/linux/netfilter/xt_statistic.h
+++ b/include/linux/netfilter/xt_statistic.h
@@@ -15,21 -13,22 +15,22 @@@ enum xt_statistic_flags
};
#define XT_STATISTIC_MASK 0x1
+ struct xt_statistic_priv;
+
struct xt_statistic_info {
- u_int16_t mode;
- u_int16_t flags;
+ __u16 mode;
+ __u16 flags;
union {
struct {
- u_int32_t probability;
+ __u32 probability;
} random;
struct {
- u_int32_t every;
- u_int32_t packet;
- u_int32_t count; /* unused */
+ __u32 every;
+ __u32 packet;
- /* Used internally by the kernel */
- __u32 count;
++ __u32 count; /* unused */
} nth;
} u;
- struct xt_statistic_info *master __attribute__((aligned(8)));
+ struct xt_statistic_priv *master __attribute__((aligned(8)));
};
#endif /* _XT_STATISTIC_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
