summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2012-11-14 05:14:06 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-14 22:02:38 -0500
commite4c94a9cdc5041cddaf1218397e4576a2d534f0f (patch)
treeab02f68019c65fe56539c8cbca078541f971ee46
parenta12c9a85813e927e1143989876d70697eb85aac9 (diff)
downloadop-kernel-dev-e4c94a9cdc5041cddaf1218397e4576a2d534f0f.zip
op-kernel-dev-e4c94a9cdc5041cddaf1218397e4576a2d534f0f.tar.gz
sit: rename rtnl functions for consistency
Functions in this file start with ipip6_. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/sit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 69e5e73..17442de 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1197,7 +1197,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 */
@@ -1217,7 +1217,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;
@@ -1241,8 +1241,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 = {
OpenPOWER on IntegriCloud