ipvs: Remove possibly unused net variable from ip_vs_out

Since 6f2bcea9917d ("ipvs: Pass ipvs into ip_vs_in_icmp and
ip_vs_in_icmp_v6") the net variable in ip_vs_out() appears to be unused
unless CONFIG_IP_VS_IPV6 is set. To resolve this remove the net variable
and dereference net asneeded.

Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Hello,

On Tue, 6 Oct 2015, Simon Horman wrote:

> Since 6f2bcea9917d ("ipvs: Pass ipvs into ip_vs_in_icmp and
> ip_vs_in_icmp_v6") the net variable in ip_vs_out() appears to be unused
> unless CONFIG_IP_VS_IPV6 is set. To resolve this remove the net variable
> and dereference net asneeded.
> 
> Signed-off-by: Simon Horman <horms@verge.net.au>

	Both patches look good to me

Acked-by: Julian Anastasov <ja@ssi.bg>

> ---
>  net/netfilter/ipvs/ip_vs_core.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index d08df435c2aa..3773154d9b71 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -1172,7 +1172,6 @@ drop:
>  static unsigned int
>  ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int af)
>  {
> -	struct net *net = ipvs->net;
>  	struct ip_vs_iphdr iph;
>  	struct ip_vs_protocol *pp;
>  	struct ip_vs_proto_data *pd;
> @@ -1272,7 +1271,7 @@ ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, in
>  #ifdef CONFIG_IP_VS_IPV6
>  				if (af == AF_INET6) {
>  					if (!skb->dev)
> -						skb->dev = net->loopback_dev;
> +						skb->dev = ipvs->net->loopback_dev;
>  					icmpv6_send(skb,
>  						    ICMPV6_DEST_UNREACH,
>  						    ICMPV6_PORT_UNREACH,
> -- 
> 2.1.4

Regards

--
Julian Anastasov <ja@ssi.bg>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Tue, Oct 6, 2015 at 11:24 AM, Julian Anastasov <ja@ssi.bg> wrote:
>
>         Hello,
>
> On Tue, 6 Oct 2015, Simon Horman wrote:
>
>> Since 6f2bcea9917d ("ipvs: Pass ipvs into ip_vs_in_icmp and
>> ip_vs_in_icmp_v6") the net variable in ip_vs_out() appears to be unused
>> unless CONFIG_IP_VS_IPV6 is set. To resolve this remove the net variable
>> and dereference net asneeded.
>>
>> Signed-off-by: Simon Horman <horms@verge.net.au>
>
>         Both patches look good to me
>
> Acked-by: Julian Anastasov <ja@ssi.bg>
>

David sent a same patch earlier:

http://www.spinics.net/lists/netdev/msg345887.html
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Tue, Oct 06, 2015 at 04:27:35PM -0700, Cong Wang wrote:
> On Tue, Oct 6, 2015 at 11:24 AM, Julian Anastasov <ja@ssi.bg> wrote:
> >
> >         Hello,
> >
> > On Tue, 6 Oct 2015, Simon Horman wrote:
> >
> >> Since 6f2bcea9917d ("ipvs: Pass ipvs into ip_vs_in_icmp and
> >> ip_vs_in_icmp_v6") the net variable in ip_vs_out() appears to be unused
> >> unless CONFIG_IP_VS_IPV6 is set. To resolve this remove the net variable
> >> and dereference net asneeded.
> >>
> >> Signed-off-by: Simon Horman <horms@verge.net.au>
> >
> >         Both patches look good to me
> >
> > Acked-by: Julian Anastasov <ja@ssi.bg>
> >
> 
> David sent a same patch earlier:
> 
> http://www.spinics.net/lists/netdev/msg345887.html

Thanks, I have queued up his version in ipvs-next.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html