]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ce9b20 f03eb12)
Merge branch 'ipv6_tunnel_iflink_init'
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 Nov 2014 20:42:35 +0000 (15:42 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Nov 2014 20:42:35 +0000 (15:42 -0500)
commitc495d64836e4e2d45c6d53621b4722abf4d36499
treef70dc113b3c7946819f2f2829cb696159bea8cectree
parent3ce9b20f1971690b8b3b620e735ec99431573b39commit | diff
parentf03eb128e3f4276f46442d14f3b8f864f3775821commit | diff
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 <davem@davemloft.net>
Ubuntu combined Linux kernel mirror