Re: [PATCH 1/3] Misc cleanups

[Patrick McHardy <kaber@trash.net>]

Jan Engelhardt wrote:
> Make a number of variables const and/or remove unneeded casts.


Applied with some minor changes, thanks Jan.


> @@ -249,7 +249,7 @@ clusterip_hashfn(struct sk_buff *skb, st
>  	case IPPROTO_SCTP:
>  	case IPPROTO_DCCP:
>  	case IPPROTO_ICMP:
> -		ports = (void *)iph+iph->ihl*4;
> +		ports = (const void *)iph+iph->ihl*4;


This one is not neccessary.

> @@ -88,7 +88,7 @@ masquerade_target(struct sk_buff **pskb,
>  		return NF_ACCEPT;
>  
>  	mr = targinfo;
> -	rt = (struct rtable *)(*pskb)->dst;
> +	rt = (const struct rtable *)(*pskb)->dst;


This one neither.

> @@ -147,7 +147,8 @@ static int masq_inet_event(struct notifi
>  			   unsigned long event,
>  			   void *ptr)
>  {
> -	struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
> +	const struct net_device *dev =
> +		((const struct in_ifaddr *)ptr)->ifa_dev->dev;


Same here.

> +++ linux-2.6.22-rc3-git6/net/ipv4/netfilter/ipt_TOS.c
> @@ -50,7 +50,8 @@ checkentry(const char *tablename,
>  	   void *targinfo,
>  	   unsigned int hook_mask)
>  {
> -	const u_int8_t tos = ((struct ipt_tos_target_info *)targinfo)->tos;
> +	const u_int8_t tos =
> +		((const struct ipt_tos_target_info *)targinfo)->tos;


And here.

> @@ -443,8 +449,8 @@ hashlimit_match(const struct sk_buff *sk
>  		unsigned int protoff,
>  		bool *hotdrop)
>  {
> -	struct xt_hashlimit_info *r =
> -		((struct xt_hashlimit_info *)matchinfo)->u.master;
> +	const struct xt_hashlimit_info *r =
> +		((const struct xt_hashlimit_info *)matchinfo)->u.master;


This one is fine I guess since matchinfo is also const. Same for
all other matches.