aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2012-11-14 00:13:59 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-14 22:02:37 -0500
commitb58d731acc599b69fc50cb40e13f30f0f16fcb3f (patch)
tree413291f16990a7a50cf9a0e848e710974fd29076 /net/ipv6/ip6_tunnel.c
parentcfa323b6b98f44ddf46cc987f74a23dcab697134 (diff)
ip6tnl: rename rtnl functions for consistency
Functions in this file start with ip6_tnl_. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 929ba0b5cc9b..c054847a4e27 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1498,7 +1498,7 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev)
1498 return 0; 1498 return 0;
1499} 1499}
1500 1500
1501static size_t ip6_get_size(const struct net_device *dev) 1501static size_t ip6_tnl_get_size(const struct net_device *dev)
1502{ 1502{
1503 return 1503 return
1504 /* IFLA_IPTUN_LINK */ 1504 /* IFLA_IPTUN_LINK */
@@ -1520,7 +1520,7 @@ static size_t ip6_get_size(const struct net_device *dev)
1520 0; 1520 0;
1521} 1521}
1522 1522
1523static int ip6_fill_info(struct sk_buff *skb, const struct net_device *dev) 1523static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev)
1524{ 1524{
1525 struct ip6_tnl *tunnel = netdev_priv(dev); 1525 struct ip6_tnl *tunnel = netdev_priv(dev);
1526 struct __ip6_tnl_parm *parm = &tunnel->parms; 1526 struct __ip6_tnl_parm *parm = &tunnel->parms;
@@ -1546,8 +1546,8 @@ static struct rtnl_link_ops ip6_link_ops __read_mostly = {
1546 .kind = "ip6tnl", 1546 .kind = "ip6tnl",
1547 .maxtype = IFLA_IPTUN_MAX, 1547 .maxtype = IFLA_IPTUN_MAX,
1548 .priv_size = sizeof(struct ip6_tnl), 1548 .priv_size = sizeof(struct ip6_tnl),
1549 .get_size = ip6_get_size, 1549 .get_size = ip6_tnl_get_size,
1550 .fill_info = ip6_fill_info, 1550 .fill_info = ip6_tnl_fill_info,
1551}; 1551};
1552 1552
1553static struct xfrm6_tunnel ip4ip6_handler __read_mostly = { 1553static struct xfrm6_tunnel ip4ip6_handler __read_mostly = {