| commit | 5568cdc368c349eee7b5fc48bc956234a0828d71 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Mar 29 11:42:14 2018 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Mar 29 11:42:14 2018 -0400 |
| tree | 504f8fa0ce3f02fb51d09fe095849e0cc816a6e6 | |
| parent | 2d2d99ec13f62d5d2cecb6169dfdb6bbe05356d0 [diff] |
ip_tunnel: Resolve ipsec merge conflict properly. We want to use dev_set_mtu() regardless of how we calculate the mtu value. Signed-off-by: David S. Miller <davem@davemloft.net>