]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2d2d99e) | patch
ip_tunnel: Resolve ipsec merge conflict properly.
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Mar 2018 15:42:14 +0000 (11:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Mar 2018 15:42:14 +0000 (11:42 -0400)
commit5568cdc368c349eee7b5fc48bc956234a0828d71
tree504f8fa0ce3f02fb51d09fe095849e0cc816a6e6tree | snapshot
parent2d2d99ec13f62d5d2cecb6169dfdb6bbe05356d0commit | 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>
net/ipv4/ip_tunnel.c diff | blob | blame | history
A mirror of Linus' kernel repository