Merge branch 'ipv6_tunnel_iflink_init'

Browse source

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>

...

This commit is contained in:

David S. Miller 2014-11-03 15:42:35 -05:00

parent 3ce9b20f19 f03eb128e3

commit c495d64836

4 changed files with 11 additions and 30 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

net/ipv6/ip6_gre.c

View file

10

net/ipv6/ip6_tunnel.c

View file

11

net/ipv6/ip6_vti.c

View file

15

net/ipv6/sit.c

View file