diff mbox

lwtunnel: Fix the sparse warnings in fib_encap_match

Message ID 1439969609-11189-1-git-send-email-ying.xue@windriver.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Ying Xue Aug. 19, 2015, 7:33 a.m. UTC
When CONFIG_LWTUNNEL config is not enabled, the lwtstate_free() is not
declared in lwtunnel.h at all. However, even in this case, the function
is still referenced in fib_semantics.c so that there appears the
following sparse warnings:

net/ipv4/fib_semantics.c:553:17: error: undefined identifier 'lwtstate_free'
  CC      net/ipv4/fib_semantics.o
  net/ipv4/fib_semantics.c: In function ‘fib_encap_match’:
  net/ipv4/fib_semantics.c:553:3: error: implicit declaration of function ‘lwtstate_free’ [-Werror=implicit-function-declaration]
  cc1: some warnings being treated as errors
  make[1]: *** [net/ipv4/fib_semantics.o] Error 1
  make: *** [net/ipv4/fib_semantics.o] Error 2

To eliminate the error, we define an empty function for lwtstate_free()
in lwtunnel.h when CONFIG_LWTUNNEL is disabled.

Fixes: df383e6240ef ("lwtunnel: fix memory leak")
Cc: Jiri Benc <jbenc@redhat.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ying Xue <ying.xue@windriver.com>
---
 include/net/lwtunnel.h |    4 ++++
 1 file changed, 4 insertions(+)

Comments

Jiri Benc Aug. 19, 2015, 7:40 a.m. UTC | #1
On Wed, 19 Aug 2015 15:33:29 +0800, Ying Xue wrote:
> When CONFIG_LWTUNNEL config is not enabled, the lwtstate_free() is not
> declared in lwtunnel.h at all. However, even in this case, the function
> is still referenced in fib_semantics.c so that there appears the
> following sparse warnings:
> 
> net/ipv4/fib_semantics.c:553:17: error: undefined identifier 'lwtstate_free'
>   CC      net/ipv4/fib_semantics.o
>   net/ipv4/fib_semantics.c: In function ‘fib_encap_match’:
>   net/ipv4/fib_semantics.c:553:3: error: implicit declaration of function ‘lwtstate_free’ [-Werror=implicit-function-declaration]
>   cc1: some warnings being treated as errors
>   make[1]: *** [net/ipv4/fib_semantics.o] Error 1
>   make: *** [net/ipv4/fib_semantics.o] Error 2
> 
> To eliminate the error, we define an empty function for lwtstate_free()
> in lwtunnel.h when CONFIG_LWTUNNEL is disabled.
> 
> Fixes: df383e6240ef ("lwtunnel: fix memory leak")
> Cc: Jiri Benc <jbenc@redhat.com>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Ying Xue <ying.xue@windriver.com>

Acked-by: Jiri Benc <jbenc@redhat.com>

Thanks, you beat me to it.

This is for net-next.

 Jiri
Ying Xue Aug. 19, 2015, 7:41 a.m. UTC | #2
On 08/19/2015 03:40 PM, Jiri Benc wrote:
> On Wed, 19 Aug 2015 15:33:29 +0800, Ying Xue wrote:
>> When CONFIG_LWTUNNEL config is not enabled, the lwtstate_free() is not
>> declared in lwtunnel.h at all. However, even in this case, the function
>> is still referenced in fib_semantics.c so that there appears the
>> following sparse warnings:
>>
>> net/ipv4/fib_semantics.c:553:17: error: undefined identifier 'lwtstate_free'
>>   CC      net/ipv4/fib_semantics.o
>>   net/ipv4/fib_semantics.c: In function ‘fib_encap_match’:
>>   net/ipv4/fib_semantics.c:553:3: error: implicit declaration of function ‘lwtstate_free’ [-Werror=implicit-function-declaration]
>>   cc1: some warnings being treated as errors
>>   make[1]: *** [net/ipv4/fib_semantics.o] Error 1
>>   make: *** [net/ipv4/fib_semantics.o] Error 2
>>
>> To eliminate the error, we define an empty function for lwtstate_free()
>> in lwtunnel.h when CONFIG_LWTUNNEL is disabled.
>>
>> Fixes: df383e6240ef ("lwtunnel: fix memory leak")
>> Cc: Jiri Benc <jbenc@redhat.com>
>> Reported-by: kbuild test robot <fengguang.wu@intel.com>
>> Signed-off-by: Ying Xue <ying.xue@windriver.com>
> 
> Acked-by: Jiri Benc <jbenc@redhat.com>
> 
> Thanks, you beat me to it.
> 
> This is for net-next.
> 

Yes, I found I made a mistake after I sent out the patch.

I will resend the patch to net-next tree again.

Thanks,
Ying

>  Jiri
> 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h
index 34fd8f7..cfee539 100644
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
@@ -93,6 +93,10 @@  int lwtunnel_input6(struct sk_buff *skb);
 
 #else
 
+static inline void lwtstate_free(struct lwtunnel_state *lws)
+{
+}
+
 static inline struct lwtunnel_state *
 lwtstate_get(struct lwtunnel_state *lws)
 {