* [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv()
@ 2017-11-17 16:16 Alexey Kodanev
2017-11-17 16:16 ` [PATCH 2/2] ip6_tunnel: pass tun_dst arg from ip6_tnl_rcv() to __ip6_tnl_rcv() Alexey Kodanev
2017-11-19 3:22 ` [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Alexey Kodanev @ 2017-11-17 16:16 UTC (permalink / raw)
To: netdev; +Cc: Tom Herbert, David Miller, Alexey Kodanev
After commit 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call
common GRE functions") it's not used anywhere in the module, but
previously was used in ip6gre_rcv().
Fixes: 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call common GRE functions")
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
net/ipv6/ip6_gre.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 59c121b..5d6bee0 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -461,7 +461,7 @@ static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)
&ipv6h->saddr, &ipv6h->daddr, tpi->key,
tpi->proto);
if (tunnel) {
- ip6_tnl_rcv(tunnel, skb, tpi, NULL, false);
+ ip6_tnl_rcv(tunnel, skb, tpi, NULL, log_ecn_error);
return PACKET_RCVD;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ip6_tunnel: pass tun_dst arg from ip6_tnl_rcv() to __ip6_tnl_rcv()
2017-11-17 16:16 [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() Alexey Kodanev
@ 2017-11-17 16:16 ` Alexey Kodanev
2017-11-19 3:22 ` David Miller
2017-11-19 3:22 ` [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Alexey Kodanev @ 2017-11-17 16:16 UTC (permalink / raw)
To: netdev; +Cc: Tom Herbert, David Miller, Alexey Kodanev
Otherwise tun_dst argument is unused there. Currently, ip6_tnl_rcv()
invoked with tun_dst set to NULL, so there is no actual functional
changes introduced in this patch.
Fixes: 0d3c703a9d17 ("ipv6: Cleanup IPv6 tunnel receive path")
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
net/ipv6/ip6_tunnel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index a1c2444..bc050e8 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -869,7 +869,7 @@ int ip6_tnl_rcv(struct ip6_tnl *t, struct sk_buff *skb,
struct metadata_dst *tun_dst,
bool log_ecn_err)
{
- return __ip6_tnl_rcv(t, skb, tpi, NULL, ip6ip6_dscp_ecn_decapsulate,
+ return __ip6_tnl_rcv(t, skb, tpi, tun_dst, ip6ip6_dscp_ecn_decapsulate,
log_ecn_err);
}
EXPORT_SYMBOL(ip6_tnl_rcv);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ip6_tunnel: pass tun_dst arg from ip6_tnl_rcv() to __ip6_tnl_rcv()
2017-11-17 16:16 ` [PATCH 2/2] ip6_tunnel: pass tun_dst arg from ip6_tnl_rcv() to __ip6_tnl_rcv() Alexey Kodanev
@ 2017-11-19 3:22 ` David Miller
2017-11-20 11:07 ` Alexey Kodanev
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2017-11-19 3:22 UTC (permalink / raw)
To: alexey.kodanev; +Cc: netdev, tom
From: Alexey Kodanev <alexey.kodanev@oracle.com>
Date: Fri, 17 Nov 2017 19:16:18 +0300
> Otherwise tun_dst argument is unused there. Currently, ip6_tnl_rcv()
> invoked with tun_dst set to NULL, so there is no actual functional
> changes introduced in this patch.
Oh yes there is a functional change, becaue __ip6_tnl_rcv() is also
used by ipxip6_rcv() which can pass a non-NULL tnl_dst.
If anything, you commit log message is inaccurate and you need to
investigate the implications of this functional change.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv()
2017-11-17 16:16 [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() Alexey Kodanev
2017-11-17 16:16 ` [PATCH 2/2] ip6_tunnel: pass tun_dst arg from ip6_tnl_rcv() to __ip6_tnl_rcv() Alexey Kodanev
@ 2017-11-19 3:22 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2017-11-19 3:22 UTC (permalink / raw)
To: alexey.kodanev; +Cc: netdev, tom
From: Alexey Kodanev <alexey.kodanev@oracle.com>
Date: Fri, 17 Nov 2017 19:16:17 +0300
> After commit 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call
> common GRE functions") it's not used anywhere in the module, but
> previously was used in ip6gre_rcv().
>
> Fixes: 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call common GRE functions")
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Indeed, this looks unintentional, patch applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ip6_tunnel: pass tun_dst arg from ip6_tnl_rcv() to __ip6_tnl_rcv()
2017-11-19 3:22 ` David Miller
@ 2017-11-20 11:07 ` Alexey Kodanev
0 siblings, 0 replies; 5+ messages in thread
From: Alexey Kodanev @ 2017-11-20 11:07 UTC (permalink / raw)
To: David Miller; +Cc: netdev, tom
On 11/19/2017 06:22 AM, David Miller wrote:
> From: Alexey Kodanev <alexey.kodanev@oracle.com>
> Date: Fri, 17 Nov 2017 19:16:18 +0300
>
>> Otherwise tun_dst argument is unused there. Currently, ip6_tnl_rcv()
>> invoked with tun_dst set to NULL, so there is no actual functional
>> changes introduced in this patch.
> Oh yes there is a functional change, becaue __ip6_tnl_rcv() is also
> used by ipxip6_rcv() which can pass a non-NULL tnl_dst.
The patch is not changing __ip6_tnl_rcv(), only ip6_tnl_rcv() wrapper.
Thanks,
Alexey
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-11-20 11:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-17 16:16 [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() Alexey Kodanev
2017-11-17 16:16 ` [PATCH 2/2] ip6_tunnel: pass tun_dst arg from ip6_tnl_rcv() to __ip6_tnl_rcv() Alexey Kodanev
2017-11-19 3:22 ` David Miller
2017-11-20 11:07 ` Alexey Kodanev
2017-11-19 3:22 ` [PATCH 1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() 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.