From: David S. Miller Date: Thu, 25 Feb 2016 20:17:13 +0000 (-0500) Subject: Merge branch 'vxlan-rx-cleanups' X-Git-Tag: v4.6-rc1~91^2~189 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2a04c7baded1cb2717ef8d02759e2ce13ae28602;p=linux-2.6-block.git Merge branch 'vxlan-rx-cleanups' Jiri Benc says: ==================== vxlan: consolidate rx handling Currently, vxlan_rcv is just called at the end of vxlan_udp_encap_recv, continuing the rx processing where vxlan_udp_encap_recv left it. There's no clear border between those two functions. This patchset moves vxlan_udp_encap_recv and vxlan_rcv into a single function. This also allows to do some simplification in error path. The VXLAN-GPE implementation that will follow up this set can be seen at: https://github.com/jbenc/linux-vxlan/commits/master ==================== Signed-off-by: David S. Miller --- 2a04c7baded1cb2717ef8d02759e2ce13ae28602