From: David S. Miller Date: Mon, 3 Nov 2014 20:42:35 +0000 (-0500) Subject: Merge branch 'ipv6_tunnel_iflink_init' X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~119^2~42 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c495d64836e4e2d45c6d53621b4722abf4d36499;p=pandora-kernel.git Merge branch 'ipv6_tunnel_iflink_init' Steffen Klassert says: ==================== ipv6: Fix iflink setting for ipv6 tunnels The ipv6 tunnels do the dev->iflink setting too early, it gets overwritten by register_netdev(). So set dev->iflink from within a ndo_init function to keep the configured setting. This patchset fixes this for ip6_tunnel, vti6, sit and gre6. ==================== Signed-off-by: David S. Miller --- c495d64836e4e2d45c6d53621b4722abf4d36499 Reading git-diff-tree failed