[PATCH net-next v2] net: Fix unused variable compile warning

[PATCH net-next v2] net: Fix unused variable compile warning

[David Ahern]

Eric's net namespace changes in 1b75097dd7a26 leaves net unreferenced if
CONFIG_IP_VS_IPV6 is not enabled:

../net/netfilter/ipvs/ip_vs_core.c: In function ‘ip_vs_out’:
../net/netfilter/ipvs/ip_vs_core.c:1177:14: warning: unused variable ‘net’ [-Wunused-variable]

After the net refactoring there is only 1 user; push the reference to the
1 user. While the line length slightly exceeds 80 it seems to be the
best change.

Fixes: 1b75097dd7a26("ipvs: Pass ipvs into ip_vs_out")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
---
v2
- removed unrelated change from other work

 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 37dd77a3d0fb..9897e6272015 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1174,7 +1174,6 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
 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;
@@ -1274,7 +1273,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,
-- 
1.9.1

Re: [PATCH net-next v2] net: Fix unused variable compile warning

[Cong Wang]

On Thu, Oct 1, 2015 at 8:49 AM, David Ahern <dsa@cumulusnetworks.com> wrote:
> Eric's net namespace changes in 1b75097dd7a26 leaves net unreferenced if
> CONFIG_IP_VS_IPV6 is not enabled:
>
> ../net/netfilter/ipvs/ip_vs_core.c: In function ‘ip_vs_out’:
> ../net/netfilter/ipvs/ip_vs_core.c:1177:14: warning: unused variable ‘net’ [-Wunused-variable]
>
> After the net refactoring there is only 1 user; push the reference to the
> 1 user. While the line length slightly exceeds 80 it seems to be the
> best change.
>
> Fixes: 1b75097dd7a26("ipvs: Pass ipvs into ip_vs_out")
> Signed-off-by: David Ahern <dsa@cumulusnetworks.com>

I saw the same build warning, and this fix looks good to me.

DaveM, can you take this?

Thanks.

Re: [PATCH net-next v2] net: Fix unused variable compile warning

[David Miller]

From: Cong Wang <cwang@twopensource.com>
Date: Mon, 5 Oct 2015 10:53:57 -0700

> On Thu, Oct 1, 2015 at 8:49 AM, David Ahern <dsa@cumulusnetworks.com> wrote:
>> Eric's net namespace changes in 1b75097dd7a26 leaves net unreferenced if
>> CONFIG_IP_VS_IPV6 is not enabled:
>>
>> ../net/netfilter/ipvs/ip_vs_core.c: In function ‘ip_vs_out’:
>> ../net/netfilter/ipvs/ip_vs_core.c:1177:14: warning: unused variable ‘net’ [-Wunused-variable]
>>
>> After the net refactoring there is only 1 user; push the reference to the
>> 1 user. While the line length slightly exceeds 80 it seems to be the
>> best change.
>>
>> Fixes: 1b75097dd7a26("ipvs: Pass ipvs into ip_vs_out")
>> Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
> 
> I saw the same build warning, and this fix looks good to me.
> 
> DaveM, can you take this?

It should be submitted to netfilter-devel and Pablo should take it.

Re: [PATCH net-next v2] net: Fix unused variable compile warning

[Simon Horman]

On Mon, Oct 05, 2015 at 11:35:37PM -0700, David Miller wrote:
> From: Cong Wang <cwang@twopensource.com>
> Date: Mon, 5 Oct 2015 10:53:57 -0700
> 
> > On Thu, Oct 1, 2015 at 8:49 AM, David Ahern <dsa@cumulusnetworks.com> wrote:
> >> Eric's net namespace changes in 1b75097dd7a26 leaves net unreferenced if
> >> CONFIG_IP_VS_IPV6 is not enabled:
> >>
> >> ../net/netfilter/ipvs/ip_vs_core.c: In function ‘ip_vs_out’:
> >> ../net/netfilter/ipvs/ip_vs_core.c:1177:14: warning: unused variable ‘net’ [-Wunused-variable]
> >>
> >> After the net refactoring there is only 1 user; push the reference to the
> >> 1 user. While the line length slightly exceeds 80 it seems to be the
> >> best change.
> >>
> >> Fixes: 1b75097dd7a26("ipvs: Pass ipvs into ip_vs_out")
> >> Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
> > 
> > I saw the same build warning, and this fix looks good to me.
> > 
> > DaveM, can you take this?
> 
> It should be submitted to netfilter-devel and Pablo should take it.

lvs-devel would be better yet.
I submitted an identical patch there yesterday.

I'll pick up David's version and send it to Pablo ASAP.

Re: [PATCH net-next v2] net: Fix unused variable compile warning

[David Ahern]

On 10/6/15 7:02 PM, Simon Horman wrote:
> lvs-devel would be better yet.
> I submitted an identical patch there yesterday.
>
> I'll pick up David's version and send it to Pablo ASAP.

Thanks, Simon. I need to remember to consult the MAINTAINERS file.