Patchwork [net-next,09/10] sit: rename rtnl functions for consistency

login
register
mail settings
Submitter Nicolas Dichtel
Date Nov. 14, 2012, 3:14 p.m.
Message ID <1352906047-11604-10-git-send-email-nicolas.dichtel@6wind.com>
Download mbox | patch
Permalink /patch/198939/
State Accepted
Delegated to: David Miller
Headers show

Comments

Nicolas Dichtel - Nov. 14, 2012, 3:14 p.m.
Functions in this file start with ipip6_.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
 net/ipv6/sit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 28f56ee..28c1b82 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1216,7 +1216,7 @@  static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
 	return 0;
 }
 
-static size_t sit_get_size(const struct net_device *dev)
+static size_t ipip6_get_size(const struct net_device *dev)
 {
 	return
 		/* IFLA_IPTUN_LINK */
@@ -1236,7 +1236,7 @@  static size_t sit_get_size(const struct net_device *dev)
 		0;
 }
 
-static int sit_fill_info(struct sk_buff *skb, const struct net_device *dev)
+static int ipip6_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
 	struct ip_tunnel *tunnel = netdev_priv(dev);
 	struct ip_tunnel_parm *parm = &tunnel->parms;
@@ -1260,8 +1260,8 @@  static struct rtnl_link_ops sit_link_ops __read_mostly = {
 	.kind		= "sit",
 	.maxtype	= IFLA_IPTUN_MAX,
 	.priv_size	= sizeof(struct ip_tunnel),
-	.get_size	= sit_get_size,
-	.fill_info	= sit_fill_info,
+	.get_size	= ipip6_get_size,
+	.fill_info	= ipip6_fill_info,
 };
 
 static struct xfrm_tunnel sit_handler __read_mostly = {