From: Nicolas Dichtel Date: Wed, 14 Nov 2012 05:14:06 +0000 (+0000) Subject: sit: rename rtnl functions for consistency X-Git-Tag: firefly_0821_release~3680^2~1480^2~343 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e4c94a9cdc5041cddaf1218397e4576a2d534f0f;p=firefly-linux-kernel-4.4.55.git sit: rename rtnl functions for consistency Functions in this file start with ipip6_. Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller --- diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 69e5e7340743..17442dec06de 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 = {