diff options
| author | Arnd Bergmann <[email protected]> | 2016-01-01 12:18:48 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-01-05 02:50:51 +0000 |
| commit | 0efeff2905d0ea14f2ee83e6cefbda35ee8cf6fc (patch) | |
| tree | efd6236520e5ecffb0f9fa6ff723a3dc1f91f13f /net/unix/af_unix.c | |
| parent | Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s... (diff) | |
| download | kernel-0efeff2905d0ea14f2ee83e6cefbda35ee8cf6fc.tar.gz kernel-0efeff2905d0ea14f2ee83e6cefbda35ee8cf6fc.zip | |
net: make ip6tunnel_xmit definition conditional
Moving the caller of iptunnel_xmit_stats causes a build error in
randconfig builds that disable CONFIG_INET:
In file included from ../net/xfrm/xfrm_input.c:17:0:
../include/net/ip6_tunnel.h: In function 'ip6tunnel_xmit':
../include/net/ip6_tunnel.h:93:2: error: implicit declaration of function 'iptunnel_xmit_stats' [-Werror=implicit-function-declaration]
iptunnel_xmit_stats(dev, pkt_len);
The reason is that the iptunnel_xmit_stats definition is hidden
inside #ifdef CONFIG_INET but the caller is not. We can change
one or the other to fix it, and this patch adds a second #ifdef
around ip6tunnel_xmit() to avoid seeing the invalid call.
Signed-off-by: Arnd Bergmann <[email protected]>
Fixes: 039f50629b7f ("ip_tunnel: Move stats update to iptunnel_xmit()")
Acked-by: Pravin B Shelar <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions