diff options
author | Jan Engelhardt <jengelh@computergmbh.de> | 2008-04-14 03:56:05 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-04-14 03:56:05 -0400 |
commit | 3cf93c96af7adf78542d45f8a27f0e5f8704409d (patch) | |
tree | 1559a1c55ef406f9aa8efdc2d5dc8ed42059c1df /net/ipv6 | |
parent | b9f61b160336da5eaaacb0cb41ebe32169e3bde5 (diff) |
[NETFILTER]: annotate xtables targets with const and remove casts
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/ip6t_REJECT.c | 3 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6t_ipv6header.c | 3 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6t_rt.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c index baf829075f6f..44c8d65a2431 100644 --- a/net/ipv6/netfilter/ip6t_REJECT.c +++ b/net/ipv6/netfilter/ip6t_REJECT.c | |||
@@ -41,7 +41,8 @@ static void send_reset(struct sk_buff *oldskb) | |||
41 | struct tcphdr otcph, *tcph; | 41 | struct tcphdr otcph, *tcph; |
42 | unsigned int otcplen, hh_len; | 42 | unsigned int otcplen, hh_len; |
43 | int tcphoff, needs_ack; | 43 | int tcphoff, needs_ack; |
44 | struct ipv6hdr *oip6h = ipv6_hdr(oldskb), *ip6h; | 44 | const struct ipv6hdr *oip6h = ipv6_hdr(oldskb); |
45 | struct ipv6hdr *ip6h; | ||
45 | struct dst_entry *dst = NULL; | 46 | struct dst_entry *dst = NULL; |
46 | u8 proto; | 47 | u8 proto; |
47 | struct flowi fl; | 48 | struct flowi fl; |
diff --git a/net/ipv6/netfilter/ip6t_ipv6header.c b/net/ipv6/netfilter/ip6t_ipv6header.c index 3a940171f829..317a8960a757 100644 --- a/net/ipv6/netfilter/ip6t_ipv6header.c +++ b/net/ipv6/netfilter/ip6t_ipv6header.c | |||
@@ -49,7 +49,8 @@ ipv6header_mt6(const struct sk_buff *skb, const struct net_device *in, | |||
49 | temp = 0; | 49 | temp = 0; |
50 | 50 | ||
51 | while (ip6t_ext_hdr(nexthdr)) { | 51 | while (ip6t_ext_hdr(nexthdr)) { |
52 | struct ipv6_opt_hdr _hdr, *hp; | 52 | const struct ipv6_opt_hdr *hp; |
53 | struct ipv6_opt_hdr _hdr; | ||
53 | int hdrlen; | 54 | int hdrlen; |
54 | 55 | ||
55 | /* Is there enough space for the next ext header? */ | 56 | /* Is there enough space for the next ext header? */ |
diff --git a/net/ipv6/netfilter/ip6t_rt.c b/net/ipv6/netfilter/ip6t_rt.c index 12a9efe9886e..81aaf7aaaabf 100644 --- a/net/ipv6/netfilter/ip6t_rt.c +++ b/net/ipv6/netfilter/ip6t_rt.c | |||
@@ -110,7 +110,8 @@ rt_mt6(const struct sk_buff *skb, const struct net_device *in, | |||
110 | !!(rtinfo->invflags & IP6T_RT_INV_TYP))); | 110 | !!(rtinfo->invflags & IP6T_RT_INV_TYP))); |
111 | 111 | ||
112 | if (ret && (rtinfo->flags & IP6T_RT_RES)) { | 112 | if (ret && (rtinfo->flags & IP6T_RT_RES)) { |
113 | u_int32_t *rp, _reserved; | 113 | const u_int32_t *rp; |
114 | u_int32_t _reserved; | ||
114 | rp = skb_header_pointer(skb, | 115 | rp = skb_header_pointer(skb, |
115 | ptr + offsetof(struct rt0_hdr, | 116 | ptr + offsetof(struct rt0_hdr, |
116 | reserved), | 117 | reserved), |