diff options
author | Jan Engelhardt <jengelh@computergmbh.de> | 2008-01-31 07:52:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:28:11 -0500 |
commit | da3f13c95a4c6e275a9b568f358c0c120ad83ecb (patch) | |
tree | fd91e478362628b863da54db706ede33061f729b | |
parent | 82f568fc2f6bcab18e4c80291d21f7f8463ee698 (diff) |
[NETFILTER]: nf_{conntrack,nat}_proto_udp{,lite}: annotate with const
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_udp.c | 2 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_proto_udp.c | 6 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_proto_udplite.c | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/nf_nat_proto_udp.c b/net/ipv4/netfilter/nf_nat_proto_udp.c index 10df4db078af..4b8f49910ff2 100644 --- a/net/ipv4/netfilter/nf_nat_proto_udp.c +++ b/net/ipv4/netfilter/nf_nat_proto_udp.c | |||
@@ -91,7 +91,7 @@ udp_manip_pkt(struct sk_buff *skb, | |||
91 | const struct nf_conntrack_tuple *tuple, | 91 | const struct nf_conntrack_tuple *tuple, |
92 | enum nf_nat_manip_type maniptype) | 92 | enum nf_nat_manip_type maniptype) |
93 | { | 93 | { |
94 | struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff); | 94 | const struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff); |
95 | struct udphdr *hdr; | 95 | struct udphdr *hdr; |
96 | unsigned int hdroff = iphdroff + iph->ihl*4; | 96 | unsigned int hdroff = iphdroff + iph->ihl*4; |
97 | __be32 oldip, newip; | 97 | __be32 oldip, newip; |
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c index 4c1e67ed63bd..b8a35cc06416 100644 --- a/net/netfilter/nf_conntrack_proto_udp.c +++ b/net/netfilter/nf_conntrack_proto_udp.c | |||
@@ -30,7 +30,8 @@ static int udp_pkt_to_tuple(const struct sk_buff *skb, | |||
30 | unsigned int dataoff, | 30 | unsigned int dataoff, |
31 | struct nf_conntrack_tuple *tuple) | 31 | struct nf_conntrack_tuple *tuple) |
32 | { | 32 | { |
33 | struct udphdr _hdr, *hp; | 33 | const struct udphdr *hp; |
34 | struct udphdr _hdr; | ||
34 | 35 | ||
35 | /* Actually only need first 8 bytes. */ | 36 | /* Actually only need first 8 bytes. */ |
36 | hp = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr); | 37 | hp = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr); |
@@ -94,7 +95,8 @@ static int udp_error(struct sk_buff *skb, unsigned int dataoff, | |||
94 | unsigned int hooknum) | 95 | unsigned int hooknum) |
95 | { | 96 | { |
96 | unsigned int udplen = skb->len - dataoff; | 97 | unsigned int udplen = skb->len - dataoff; |
97 | struct udphdr _hdr, *hdr; | 98 | const struct udphdr *hdr; |
99 | struct udphdr _hdr; | ||
98 | 100 | ||
99 | /* Header is too small? */ | 101 | /* Header is too small? */ |
100 | hdr = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr); | 102 | hdr = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr); |
diff --git a/net/netfilter/nf_conntrack_proto_udplite.c b/net/netfilter/nf_conntrack_proto_udplite.c index d9e1532b45d9..9dd03c7aeac6 100644 --- a/net/netfilter/nf_conntrack_proto_udplite.c +++ b/net/netfilter/nf_conntrack_proto_udplite.c | |||
@@ -31,7 +31,8 @@ static int udplite_pkt_to_tuple(const struct sk_buff *skb, | |||
31 | unsigned int dataoff, | 31 | unsigned int dataoff, |
32 | struct nf_conntrack_tuple *tuple) | 32 | struct nf_conntrack_tuple *tuple) |
33 | { | 33 | { |
34 | struct udphdr _hdr, *hp; | 34 | const struct udphdr *hp; |
35 | struct udphdr _hdr; | ||
35 | 36 | ||
36 | hp = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr); | 37 | hp = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr); |
37 | if (hp == NULL) | 38 | if (hp == NULL) |
@@ -94,7 +95,8 @@ static int udplite_error(struct sk_buff *skb, unsigned int dataoff, | |||
94 | unsigned int hooknum) | 95 | unsigned int hooknum) |
95 | { | 96 | { |
96 | unsigned int udplen = skb->len - dataoff; | 97 | unsigned int udplen = skb->len - dataoff; |
97 | struct udphdr _hdr, *hdr; | 98 | const struct udphdr *hdr; |
99 | struct udphdr _hdr; | ||
98 | unsigned int cscov; | 100 | unsigned int cscov; |
99 | 101 | ||
100 | /* Header is too small? */ | 102 | /* Header is too small? */ |