| Message ID | 1510935378-11226-2-git-send-email-alexey.kodanev@oracle.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() | expand |
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.
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
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);
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(-)