git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
geneve.c
diff --git
a/drivers/net/geneve.c
b/drivers/net/geneve.c
index 0a48b3073d3d3614483e9d8ae64f073a5b3d2ead..64fda2e1040eb6d19e4a1f24fd1707e3240a7dbb 100644
(file)
--- a/
drivers/net/geneve.c
+++ b/
drivers/net/geneve.c
@@
-829,7
+829,7
@@
static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
int mtu = dst_mtu(&rt->dst) - sizeof(struct iphdr) -
GENEVE_BASE_HLEN - info->options_len - 14;
int mtu = dst_mtu(&rt->dst) - sizeof(struct iphdr) -
GENEVE_BASE_HLEN - info->options_len - 14;
- skb_dst
(skb)->ops->update_pmtu(skb_dst(skb), NULL,
skb, mtu);
+ skb_dst
_update_pmtu(
skb, mtu);
}
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
}
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
@@
-875,7
+875,7
@@
static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
int mtu = dst_mtu(dst) - sizeof(struct ipv6hdr) -
GENEVE_BASE_HLEN - info->options_len - 14;
int mtu = dst_mtu(dst) - sizeof(struct ipv6hdr) -
GENEVE_BASE_HLEN - info->options_len - 14;
- skb_dst
(skb)->ops->update_pmtu(skb_dst(skb), NULL,
skb, mtu);
+ skb_dst
_update_pmtu(
skb, mtu);
}
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
}
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);