Merge branch 'linus' into cpus4096-for-linus

[linux-2.6] / net / ipv4 / netfilter / ipt_ECN.c

diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index 21395bc2b27f5b24a28d3d5cda075a362d6fec5e..d60139c134ca1d7041c119f61d05ea867e51e2f9 100644 (file)
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -100,7 +100,7 @@ ecn_tg_check(const char *tablename, const void *e_void,
              const struct xt_target *target, void *targinfo,
              unsigned int hook_mask)
 {
-       const struct ipt_ECN_info *einfo = (struct ipt_ECN_info *)targinfo;
+       const struct ipt_ECN_info *einfo = targinfo;
        const struct ipt_entry *e = e_void;
 
        if (einfo->operation & IPT_ECN_OP_MASK) {