diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2012-11-14 05:13:59 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-11-14 22:02:37 -0500 |
| commit | b58d731acc599b69fc50cb40e13f30f0f16fcb3f (patch) | |
| tree | 413291f16990a7a50cf9a0e848e710974fd29076 /net/ipv6 | |
| parent | ip6tnl/rtnl: add IFLA_IPTUN_PROTO on dump (diff) | |
| download | linux-dev-b58d731acc599b69fc50cb40e13f30f0f16fcb3f.tar.xz linux-dev-b58d731acc599b69fc50cb40e13f30f0f16fcb3f.zip | |
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')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 8 |
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) return 0; } -static size_t ip6_get_size(const struct net_device *dev) +static size_t ip6_tnl_get_size(const struct net_device *dev) { return /* IFLA_IPTUN_LINK */ @@ -1520,7 +1520,7 @@ static size_t ip6_get_size(const struct net_device *dev) 0; } -static int ip6_fill_info(struct sk_buff *skb, const struct net_device *dev) +static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev) { struct ip6_tnl *tunnel = netdev_priv(dev); struct __ip6_tnl_parm *parm = &tunnel->parms; @@ -1546,8 +1546,8 @@ static struct rtnl_link_ops ip6_link_ops __read_mostly = { .kind = "ip6tnl", .maxtype = IFLA_IPTUN_MAX, .priv_size = sizeof(struct ip6_tnl), - .get_size = ip6_get_size, - .fill_info = ip6_fill_info, + .get_size = ip6_tnl_get_size, + .fill_info = ip6_tnl_fill_info, }; static struct xfrm6_tunnel ip4ip6_handler __read_mostly = { |