]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
geneve: fix fill_info when using collect_metadata
authorEric Garver <e@erig.me>
Tue, 23 May 2017 22:37:27 +0000 (18:37 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 7 Jun 2017 10:10:04 +0000 (12:10 +0200)
commit1642394fffd5cbcaef65b166708aa4a0443b5e8a
tree1528713e593f002f6ddc28b81fae7da478a7817b
parent4dbbbaad64c5189cd3177bb4adcbe80fcc63b4c0
geneve: fix fill_info when using collect_metadata

[ Upstream commit 11387fe4a98f75d1f4cdb3efe3b42b19205c9df5 ]

Since 9b4437a5b870 ("geneve: Unify LWT and netdev handling.") fill_info
does not return UDP_ZERO_CSUM6_RX when using COLLECT_METADATA. This is
because it uses ip_tunnel_info_af() with the device level info, which is
not valid for COLLECT_METADATA.

Fix by checking for the presence of the actual sockets.

Fixes: 9b4437a5b870 ("geneve: Unify LWT and netdev handling.")
Signed-off-by: Eric Garver <e@erig.me>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/geneve.c