ip_tunnel: Resolve ipsec merge conflict properly.

Browse source

We want to use dev_set_mtu() regardless of how we calculate
the mtu value.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-03-29 11:42:14 -04:00

parent 2d2d99ec13

commit 5568cdc368

1 changed files with 6 additions and 6 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

12

net/ipv4/ip_tunnel.c

View file