* [PATCH] ipv4: tunnel: fix compilation on ARCH=um
@ 2020-08-12 19:08 Johannes Berg
2020-08-12 20:01 ` Eric Dumazet
2020-08-12 20:12 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Johannes Berg @ 2020-08-12 19:08 UTC (permalink / raw)
To: linux-wireless, netdev; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
With certain configurations, a 64-bit ARCH=um errors
out here with an unknown csum_ipv6_magic() function.
Include the right header file to always have it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/ipv4/ip_tunnel_core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 9ddee2a0c66d..4ecf0232ba2d 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -37,6 +37,7 @@
#include <net/geneve.h>
#include <net/vxlan.h>
#include <net/erspan.h>
+#include <net/ip6_checksum.h>
const struct ip_tunnel_encap_ops __rcu *
iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: tunnel: fix compilation on ARCH=um
2020-08-12 19:08 [PATCH] ipv4: tunnel: fix compilation on ARCH=um Johannes Berg
@ 2020-08-12 20:01 ` Eric Dumazet
2020-08-12 20:27 ` David Miller
2020-08-12 20:12 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2020-08-12 20:01 UTC (permalink / raw)
To: Johannes Berg, linux-wireless, netdev; +Cc: Johannes Berg
On 8/12/20 12:08 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> With certain configurations, a 64-bit ARCH=um errors
> out here with an unknown csum_ipv6_magic() function.
> Include the right header file to always have it.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> net/ipv4/ip_tunnel_core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
> index 9ddee2a0c66d..4ecf0232ba2d 100644
> --- a/net/ipv4/ip_tunnel_core.c
> +++ b/net/ipv4/ip_tunnel_core.c
> @@ -37,6 +37,7 @@
> #include <net/geneve.h>
> #include <net/vxlan.h>
> #include <net/erspan.h>
> +#include <net/ip6_checksum.h>
>
> const struct ip_tunnel_encap_ops __rcu *
> iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;
>
Already fixed ?
commit 8ed54f167abda44da48498876953f5b7843378df
Author: Stefano Brivio <sbrivio@redhat.com>
Date: Wed Aug 5 15:39:31 2020 +0200
ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM
On architectures defining _HAVE_ARCH_IPV6_CSUM, we get
csum_ipv6_magic() defined by means of arch checksum.h headers. On
other architectures, we actually need to include net/ip6_checksum.h
to be able to use it.
Without this include, building with defconfig breaks at least for
s390.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 4cb47a8644cc ("tunnels: PMTU discovery support for directly bridged IP packets")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: tunnel: fix compilation on ARCH=um
2020-08-12 19:08 [PATCH] ipv4: tunnel: fix compilation on ARCH=um Johannes Berg
2020-08-12 20:01 ` Eric Dumazet
@ 2020-08-12 20:12 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2020-08-12 20:12 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, netdev, johannes.berg
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 12 Aug 2020 21:08:53 +0200
> From: Johannes Berg <johannes.berg@intel.com>
>
> With certain configurations, a 64-bit ARCH=um errors
> out here with an unknown csum_ipv6_magic() function.
> Include the right header file to always have it.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: tunnel: fix compilation on ARCH=um
2020-08-12 20:01 ` Eric Dumazet
@ 2020-08-12 20:27 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-08-12 20:27 UTC (permalink / raw)
To: eric.dumazet; +Cc: johannes, linux-wireless, netdev, johannes.berg
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 12 Aug 2020 13:01:16 -0700
>
>
> On 8/12/20 12:08 PM, Johannes Berg wrote:
>> From: Johannes Berg <johannes.berg@intel.com>
>>
>> With certain configurations, a 64-bit ARCH=um errors
>> out here with an unknown csum_ipv6_magic() function.
>> Include the right header file to always have it.
>>
>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> ---
>> net/ipv4/ip_tunnel_core.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
>> index 9ddee2a0c66d..4ecf0232ba2d 100644
>> --- a/net/ipv4/ip_tunnel_core.c
>> +++ b/net/ipv4/ip_tunnel_core.c
>> @@ -37,6 +37,7 @@
>> #include <net/geneve.h>
>> #include <net/vxlan.h>
>> #include <net/erspan.h>
>> +#include <net/ip6_checksum.h>
>>
>> const struct ip_tunnel_encap_ops __rcu *
>> iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;
>>
>
> Already fixed ?
>
> commit 8ed54f167abda44da48498876953f5b7843378df
> Author: Stefano Brivio <sbrivio@redhat.com>
> Date: Wed Aug 5 15:39:31 2020 +0200
>
> ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM
Indeed, this patch added a dup include, I've reverted it.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-12 20:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-12 19:08 [PATCH] ipv4: tunnel: fix compilation on ARCH=um Johannes Berg
2020-08-12 20:01 ` Eric Dumazet
2020-08-12 20:27 ` David Miller
2020-08-12 20:12 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.