diff options
-rw-r--r-- | net/bridge/netfilter/ebt_arpreply.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ip6.c | 4 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_limit.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_nflog.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/net/bridge/netfilter/ebt_arpreply.c b/net/bridge/netfilter/ebt_arpreply.c index 0e51c8d7e5f2..baf5510d044c 100644 --- a/net/bridge/netfilter/ebt_arpreply.c +++ b/net/bridge/netfilter/ebt_arpreply.c | |||
@@ -20,7 +20,7 @@ ebt_arpreply_tg(struct sk_buff *skb, const struct net_device *in, | |||
20 | const struct net_device *out, unsigned int hook_nr, | 20 | const struct net_device *out, unsigned int hook_nr, |
21 | const struct xt_target *target, const void *data) | 21 | const struct xt_target *target, const void *data) |
22 | { | 22 | { |
23 | struct ebt_arpreply_info *info = (void *)data; | 23 | const struct ebt_arpreply_info *info = data; |
24 | const __be32 *siptr, *diptr; | 24 | const __be32 *siptr, *diptr; |
25 | __be32 _sip, _dip; | 25 | __be32 _sip, _dip; |
26 | const struct arphdr *ap; | 26 | const struct arphdr *ap; |
diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c index 317e624ae59f..7bd983129674 100644 --- a/net/bridge/netfilter/ebt_ip6.c +++ b/net/bridge/netfilter/ebt_ip6.c | |||
@@ -32,7 +32,7 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct net_device *in, | |||
32 | const struct net_device *out, const struct xt_match *match, | 32 | const struct net_device *out, const struct xt_match *match, |
33 | const void *data, int offset, unsigned int protoff, bool *hotdrop) | 33 | const void *data, int offset, unsigned int protoff, bool *hotdrop) |
34 | { | 34 | { |
35 | const struct ebt_ip6_info *info = (struct ebt_ip6_info *)data; | 35 | const struct ebt_ip6_info *info = data; |
36 | const struct ipv6hdr *ih6; | 36 | const struct ipv6hdr *ih6; |
37 | struct ipv6hdr _ip6h; | 37 | struct ipv6hdr _ip6h; |
38 | const struct tcpudphdr *pptr; | 38 | const struct tcpudphdr *pptr; |
@@ -98,7 +98,7 @@ ebt_ip6_mt_check(const char *table, const void *entry, | |||
98 | unsigned int hook_mask) | 98 | unsigned int hook_mask) |
99 | { | 99 | { |
100 | const struct ebt_entry *e = entry; | 100 | const struct ebt_entry *e = entry; |
101 | struct ebt_ip6_info *info = (struct ebt_ip6_info *)data; | 101 | struct ebt_ip6_info *info = data; |
102 | 102 | ||
103 | if (e->ethproto != htons(ETH_P_IPV6) || e->invflags & EBT_IPROTO) | 103 | if (e->ethproto != htons(ETH_P_IPV6) || e->invflags & EBT_IPROTO) |
104 | return false; | 104 | return false; |
diff --git a/net/bridge/netfilter/ebt_limit.c b/net/bridge/netfilter/ebt_limit.c index 43d9a5003633..58aaaa149068 100644 --- a/net/bridge/netfilter/ebt_limit.c +++ b/net/bridge/netfilter/ebt_limit.c | |||
@@ -35,7 +35,7 @@ ebt_limit_mt(const struct sk_buff *skb, const struct net_device *in, | |||
35 | const struct net_device *out, const struct xt_match *match, | 35 | const struct net_device *out, const struct xt_match *match, |
36 | const void *data, int offset, unsigned int protoff, bool *hotdrop) | 36 | const void *data, int offset, unsigned int protoff, bool *hotdrop) |
37 | { | 37 | { |
38 | struct ebt_limit_info *info = (struct ebt_limit_info *)data; | 38 | struct ebt_limit_info *info = (void *)data; |
39 | unsigned long now = jiffies; | 39 | unsigned long now = jiffies; |
40 | 40 | ||
41 | spin_lock_bh(&limit_lock); | 41 | spin_lock_bh(&limit_lock); |
diff --git a/net/bridge/netfilter/ebt_nflog.c b/net/bridge/netfilter/ebt_nflog.c index 917ac3600791..74b4fa0aabc1 100644 --- a/net/bridge/netfilter/ebt_nflog.c +++ b/net/bridge/netfilter/ebt_nflog.c | |||
@@ -24,7 +24,7 @@ ebt_nflog_tg(struct sk_buff *skb, const struct net_device *in, | |||
24 | const struct net_device *out, unsigned int hooknr, | 24 | const struct net_device *out, unsigned int hooknr, |
25 | const struct xt_target *target, const void *data) | 25 | const struct xt_target *target, const void *data) |
26 | { | 26 | { |
27 | struct ebt_nflog_info *info = (struct ebt_nflog_info *)data; | 27 | const struct ebt_nflog_info *info = data; |
28 | struct nf_loginfo li; | 28 | struct nf_loginfo li; |
29 | 29 | ||
30 | li.type = NF_LOG_TYPE_ULOG; | 30 | li.type = NF_LOG_TYPE_ULOG; |
@@ -41,7 +41,7 @@ ebt_nflog_tg_check(const char *table, const void *e, | |||
41 | const struct xt_target *target, void *data, | 41 | const struct xt_target *target, void *data, |
42 | unsigned int hookmask) | 42 | unsigned int hookmask) |
43 | { | 43 | { |
44 | struct ebt_nflog_info *info = (struct ebt_nflog_info *)data; | 44 | struct ebt_nflog_info *info = data; |
45 | 45 | ||
46 | if (info->flags & ~EBT_NFLOG_MASK) | 46 | if (info->flags & ~EBT_NFLOG_MASK) |
47 | return false; | 47 | return false; |