| Message ID | 1439970377-13032-1-git-send-email-ying.xue@windriver.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Ying Xue <ying.xue@windriver.com> Date: Wed, 19 Aug 2015 15:46:17 +0800 > 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> Applied, thanks.
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) {
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> --- include/net/lwtunnel.h | 4 ++++ 1 file changed, 4 insertions(+)