From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, eric.dumazet@gmail.com,
Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH net-next 02/10] ip6tnl: rename rtnl functions for consistency
Date: Wed, 14 Nov 2012 16:13:59 +0100 [thread overview]
Message-ID: <1352906047-11604-3-git-send-email-nicolas.dichtel@6wind.com> (raw)
In-Reply-To: <1352906047-11604-1-git-send-email-nicolas.dichtel@6wind.com>
Functions in this file start with ip6_tnl_.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
net/ipv6/ip6_tunnel.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 9a7d8c7..6d35426 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1506,7 +1506,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 */
@@ -1528,7 +1528,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;
@@ -1554,8 +1554,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 = {
--
1.7.12
next prev parent reply other threads:[~2012-11-14 15:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 15:13 [PATCH net-next 0/10] Add support of tunnel management via rtnetlink Nicolas Dichtel
2012-11-14 15:13 ` [PATCH net-next 01/10] ip6tnl/rtnl: add IFLA_IPTUN_PROTO on dump Nicolas Dichtel
2012-11-14 15:13 ` Nicolas Dichtel [this message]
2012-11-14 15:14 ` [PATCH net-next 03/10] ip6tnl: add support of link creation via rtnl Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 04/10] ipip: always notify change when params are updated Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 05/10] ipip/rtnl: add IFLA_IPTUN_PMTUDISC on dump Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 06/10] ipip: add support of link creation via rtnl Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 07/10] sit: always notify change when params are updated Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 08/10] sit/rtnl: add missing parameters on dump Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 09/10] sit: rename rtnl functions for consistency Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 10/10] sit: add support of link creation via rtnl Nicolas Dichtel
2012-11-15 3:03 ` [PATCH net-next 0/10] Add support of tunnel management via rtnetlink David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352906047-11604-3-git-send-email-nicolas.dichtel@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox