diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 2d7b0246475d..3717bdf34f6e 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | |||
@@ -30,7 +30,8 @@ | |||
30 | static int ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, | 30 | static int ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, |
31 | struct nf_conntrack_tuple *tuple) | 31 | struct nf_conntrack_tuple *tuple) |
32 | { | 32 | { |
33 | u_int32_t _addrs[8], *ap; | 33 | const u_int32_t *ap; |
34 | u_int32_t _addrs[8]; | ||
34 | 35 | ||
35 | ap = skb_header_pointer(skb, nhoff + offsetof(struct ipv6hdr, saddr), | 36 | ap = skb_header_pointer(skb, nhoff + offsetof(struct ipv6hdr, saddr), |
36 | sizeof(_addrs), _addrs); | 37 | sizeof(_addrs), _addrs); |
@@ -146,8 +147,8 @@ static unsigned int ipv6_confirm(unsigned int hooknum, | |||
146 | int (*okfn)(struct sk_buff *)) | 147 | int (*okfn)(struct sk_buff *)) |
147 | { | 148 | { |
148 | struct nf_conn *ct; | 149 | struct nf_conn *ct; |
149 | struct nf_conn_help *help; | 150 | const struct nf_conn_help *help; |
150 | struct nf_conntrack_helper *helper; | 151 | const struct nf_conntrack_helper *helper; |
151 | enum ip_conntrack_info ctinfo; | 152 | enum ip_conntrack_info ctinfo; |
152 | unsigned int ret, protoff; | 153 | unsigned int ret, protoff; |
153 | unsigned int extoff = (u8 *)(ipv6_hdr(skb) + 1) - skb->data; | 154 | unsigned int extoff = (u8 *)(ipv6_hdr(skb) + 1) - skb->data; |