diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-29 10:14:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-29 10:15:51 -0500 |
| commit | 3e3ab9ccca5b50b11bd4d16c2048b667343354bd (patch) | |
| tree | 7279f7401e7cc2b93fb7cb2bff894b5385429a68 /drivers/net/vxlan.c | |
| parent | 868c36dcc949c26bc74fa4661b670d9acc6489e4 (diff) | |
| parent | ba804bb4b72e57374b5f567b783aa0298fba0ce6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 82090ae7ced1..fab7a4db249e 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c | |||
| @@ -2158,8 +2158,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, | |||
| 2158 | if (skb_dst(skb)) { | 2158 | if (skb_dst(skb)) { |
| 2159 | int mtu = dst_mtu(ndst) - VXLAN_HEADROOM; | 2159 | int mtu = dst_mtu(ndst) - VXLAN_HEADROOM; |
| 2160 | 2160 | ||
| 2161 | skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, | 2161 | skb_dst_update_pmtu(skb, mtu); |
| 2162 | skb, mtu); | ||
| 2163 | } | 2162 | } |
| 2164 | 2163 | ||
| 2165 | tos = ip_tunnel_ecn_encap(tos, old_iph, skb); | 2164 | tos = ip_tunnel_ecn_encap(tos, old_iph, skb); |
| @@ -2200,8 +2199,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, | |||
| 2200 | if (skb_dst(skb)) { | 2199 | if (skb_dst(skb)) { |
| 2201 | int mtu = dst_mtu(ndst) - VXLAN6_HEADROOM; | 2200 | int mtu = dst_mtu(ndst) - VXLAN6_HEADROOM; |
| 2202 | 2201 | ||
| 2203 | skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, | 2202 | skb_dst_update_pmtu(skb, mtu); |
| 2204 | skb, mtu); | ||
| 2205 | } | 2203 | } |
| 2206 | 2204 | ||
| 2207 | tos = ip_tunnel_ecn_encap(tos, old_iph, skb); | 2205 | tos = ip_tunnel_ecn_encap(tos, old_iph, skb); |