From: David S. Miller Date: Thu, 28 Apr 2016 21:02:45 +0000 (-0400) Subject: Merge branch 'gre-lwt-fixes' X-Git-Tag: v4.6-rc7~38^2~13 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c76f3d2922115f4e1327a2dcce47e94453e3375;p=linux-2.6-block.git Merge branch 'gre-lwt-fixes' Jiri Benc says: ==================== gre: fix lwtunnel support This patchset fixes a few bugs in ipgre metadata mode implementation. As an example, in this setup: ip a a 192.168.1.1/24 dev eth0 ip l a gre1 type gre external ip l s gre1 up ip a a 192.168.99.1/24 dev gre1 ip r a 192.168.99.2/32 encap ip dst 192.168.1.2 ttl 10 dev gre1 ping 192.168.99.2 the traffic does not go through before this patchset and does as expected with it applied. v3: Back to v1 in order not to break existing users. Dropped patch 3, will be fixed in iproute2 instead. v2: Rejecting invalid configuration, added patch 3, dropped patch for ETH_P_TEB (will target net-next). ==================== Signed-off-by: David S. Miller --- 6c76f3d2922115f4e1327a2dcce47e94453e3375