Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02e23f40 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[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: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ddd0ed0

net/netfilter/nf_conntrack_sane.c

+5 −4
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ static int help(struct sk_buff *skb, 
		enum ip_conntrack_info ctinfo)

{

	unsigned int dataoff, datalen;

	struct tcphdr _tcph, *th;

	char *sb_ptr;

	const struct tcphdr *th;

	struct tcphdr _tcph;

	void *sb_ptr;

	int ret = NF_ACCEPT;

	int dir = CTINFO2DIR(ctinfo);

	struct nf_ct_sane_master *ct_sane_info;
@@ -99,7 +100,7 @@ static int help(struct sk_buff *skb, 
		if (datalen != sizeof(struct sane_request))

			goto out;



		req = (struct sane_request *)sb_ptr;

		req = sb_ptr;

		if (req->RPC_code != htonl(SANE_NET_START)) {

			/* Not an interesting command */

			ct_sane_info->state = SANE_STATE_NORMAL;
@@ -123,7 +124,7 @@ static int help(struct sk_buff *skb, 
		goto out;

	}



	reply = (struct sane_reply_net_start *)sb_ptr;

	reply = sb_ptr;

	if (reply->status != htonl(SANE_STATUS_SUCCESS)) {

		/* saned refused the command */

		pr_debug("nf_ct_sane: unsuccessful SANE_STATUS = %u\n",