projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipv6: Rename the dst_cache helper functions in ip6_tunnel
[deliverable/linux.git]
/
net
/
ipv6
/
ip6_gre.c
diff --git
a/net/ipv6/ip6_gre.c
b/net/ipv6/ip6_gre.c
index af60d46129c11dfb2532c31b7ca820bd1eb7d271..24f5dd8f76a831e283e8097ca27e946ee2c84c9b 100644
(file)
--- a/
net/ipv6/ip6_gre.c
+++ b/
net/ipv6/ip6_gre.c
@@
-634,7
+634,7
@@
static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb,
}
if (!fl6->flowi6_mark)
}
if (!fl6->flowi6_mark)
- dst = ip6_tnl_dst_
check
(tunnel);
+ dst = ip6_tnl_dst_
get
(tunnel);
if (!dst) {
ndst = ip6_route_output(net, NULL, fl6);
if (!dst) {
ndst = ip6_route_output(net, NULL, fl6);
@@
-763,7
+763,7
@@
static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb,
ip6tunnel_xmit(NULL, skb, dev);
if (ndst)
ip6tunnel_xmit(NULL, skb, dev);
if (ndst)
- ip6_tnl_dst_s
tore
(tunnel, ndst);
+ ip6_tnl_dst_s
et
(tunnel, ndst);
return 0;
tx_err_link_failure:
stats->tx_carrier_errors++;
return 0;
tx_err_link_failure:
stats->tx_carrier_errors++;
This page took
0.026062 seconds
and
5
git commands to generate.