diff options
author | Jan Engelhardt <jengelh@computergmbh.de> | 2008-01-31 07:51:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:28:10 -0500 |
commit | 02e23f4057fa86d6ecdbd83b5116c3c0e4c76fac (patch) | |
tree | 8fa9b5c0a8781700bbc8955bbab5d9010dc2c4a3 | |
parent | 9ddd0ed050445176a97e11b2b24d6fbc01843da6 (diff) |
[NETFILTER]: nf_conntrack_sane: annotate SANE helper with const
Annotate nf_conntrack_sane variables with const qualifier and remove
a few casts.
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/netfilter/nf_conntrack_sane.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c index b5a16c6e21c2..a70051d741a7 100644 --- a/net/netfilter/nf_conntrack_sane.c +++ b/net/netfilter/nf_conntrack_sane.c | |||
@@ -62,8 +62,9 @@ static int help(struct sk_buff *skb, | |||
62 | enum ip_conntrack_info ctinfo) | 62 | enum ip_conntrack_info ctinfo) |
63 | { | 63 | { |
64 | unsigned int dataoff, datalen; | 64 | unsigned int dataoff, datalen; |
65 | struct tcphdr _tcph, *th; | 65 | const struct tcphdr *th; |
66 | char *sb_ptr; | 66 | struct tcphdr _tcph; |
67 | void *sb_ptr; | ||
67 | int ret = NF_ACCEPT; | 68 | int ret = NF_ACCEPT; |
68 | int dir = CTINFO2DIR(ctinfo); | 69 | int dir = CTINFO2DIR(ctinfo); |
69 | struct nf_ct_sane_master *ct_sane_info; | 70 | struct nf_ct_sane_master *ct_sane_info; |
@@ -99,7 +100,7 @@ static int help(struct sk_buff *skb, | |||
99 | if (datalen != sizeof(struct sane_request)) | 100 | if (datalen != sizeof(struct sane_request)) |
100 | goto out; | 101 | goto out; |
101 | 102 | ||
102 | req = (struct sane_request *)sb_ptr; | 103 | req = sb_ptr; |
103 | if (req->RPC_code != htonl(SANE_NET_START)) { | 104 | if (req->RPC_code != htonl(SANE_NET_START)) { |
104 | /* Not an interesting command */ | 105 | /* Not an interesting command */ |
105 | ct_sane_info->state = SANE_STATE_NORMAL; | 106 | ct_sane_info->state = SANE_STATE_NORMAL; |
@@ -123,7 +124,7 @@ static int help(struct sk_buff *skb, | |||
123 | goto out; | 124 | goto out; |
124 | } | 125 | } |
125 | 126 | ||
126 | reply = (struct sane_reply_net_start *)sb_ptr; | 127 | reply = sb_ptr; |
127 | if (reply->status != htonl(SANE_STATUS_SUCCESS)) { | 128 | if (reply->status != htonl(SANE_STATUS_SUCCESS)) { |
128 | /* saned refused the command */ | 129 | /* saned refused the command */ |
129 | pr_debug("nf_ct_sane: unsuccessful SANE_STATUS = %u\n", | 130 | pr_debug("nf_ct_sane: unsuccessful SANE_STATUS = %u\n", |