From: Randy Dunlap <[email protected]>
Fix psample build error when CONFIG_INET is not set/enabled.
PSAMPLE should depend on INET instead of NET since
ip_tunnel_info_opts() is only present for CONFIG_INET.
../net/psample/psample.c: In function ‘__psample_ip_tun_to_nlattr’:
../net/psample/psample.c:216:25: error: implicit declaration of function ‘ip_tunnel_info_opts’; did you mean ‘ip_tunnel_info_opts_set’? [-Werror=implicit-function-declaration]
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Yotam Gigi <[email protected]>
---
This might be too stringent...
net/psample/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20200522.orig/net/psample/Kconfig
+++ linux-next-20200522/net/psample/Kconfig
@@ -4,7 +4,7 @@
#
menuconfig PSAMPLE
- depends on NET
+ depends on INET
tristate "Packet-sampling netlink channel"
default n
help
On Fri, May 22, 2020 at 12:03 PM Randy Dunlap <[email protected]> wrote:
>
> From: Randy Dunlap <[email protected]>
>
> Fix psample build error when CONFIG_INET is not set/enabled.
> PSAMPLE should depend on INET instead of NET since
> ip_tunnel_info_opts() is only present for CONFIG_INET.
>
> ../net/psample/psample.c: In function ‘__psample_ip_tun_to_nlattr’:
> ../net/psample/psample.c:216:25: error: implicit declaration of function ‘ip_tunnel_info_opts’; did you mean ‘ip_tunnel_info_opts_set’? [-Werror=implicit-function-declaration]
Or just make this tunnel support optional. psample does not
require it to function correctly.
Thanks.
On 5/22/20 12:17 PM, Cong Wang wrote:
> On Fri, May 22, 2020 at 12:03 PM Randy Dunlap <[email protected]> wrote:
>>
>> From: Randy Dunlap <[email protected]>
>>
>> Fix psample build error when CONFIG_INET is not set/enabled.
>> PSAMPLE should depend on INET instead of NET since
>> ip_tunnel_info_opts() is only present for CONFIG_INET.
>>
>> ../net/psample/psample.c: In function ‘__psample_ip_tun_to_nlattr’:
>> ../net/psample/psample.c:216:25: error: implicit declaration of function ‘ip_tunnel_info_opts’; did you mean ‘ip_tunnel_info_opts_set’? [-Werror=implicit-function-declaration]
>
> Or just make this tunnel support optional. psample does not
> require it to function correctly.
Sure, I thought of that, but it's not clear to me which bits of it
to make optional, so I'll leave it for its maintainer to handle.
thanks.
--
~Randy
On Fri, May 22, 2020 at 12:48 PM Randy Dunlap <[email protected]> wrote:
>
> On 5/22/20 12:17 PM, Cong Wang wrote:
> > On Fri, May 22, 2020 at 12:03 PM Randy Dunlap <[email protected]> wrote:
> >>
> >> From: Randy Dunlap <[email protected]>
> >>
> >> Fix psample build error when CONFIG_INET is not set/enabled.
> >> PSAMPLE should depend on INET instead of NET since
> >> ip_tunnel_info_opts() is only present for CONFIG_INET.
> >>
> >> ../net/psample/psample.c: In function ‘__psample_ip_tun_to_nlattr’:
> >> ../net/psample/psample.c:216:25: error: implicit declaration of function ‘ip_tunnel_info_opts’; did you mean ‘ip_tunnel_info_opts_set’? [-Werror=implicit-function-declaration]
> >
> > Or just make this tunnel support optional. psample does not
> > require it to function correctly.
>
> Sure, I thought of that, but it's not clear to me which bits of it
> to make optional, so I'll leave it for its maintainer to handle.
The code commit d8bed686ab96169ac80b497d1cbed89300d97f83
adds is optional, so it can be just put into #ifdef's.
Thanks.