Permalink
Browse files

route: add libnl name prefix to global variable link_policy

Public names should be prefixed with a libnl specific
prefix to avoid name collisions. Rename link_policy to
rtln_link_policy.

Related bugs:
  #52
  https://bugzilla.gnome.org/show_bug.cgi?id=720902
  https://bugs.gentoo.org/show_bug.cgi?id=494986
  https://bugs.gentoo.org/show_bug.cgi?id=494890

Signed-off-by: Thomas Haller <thaller@redhat.com>
  • Loading branch information...
1 parent 62c37fa commit 2cf635b06a678ebe09d6ea6db72bc09de09f84c8 @thom311 committed Jan 2, 2014
Showing with 4 additions and 4 deletions.
  1. +1 −1 include/netlink/route/link.h
  2. +2 −2 lib/route/link.c
  3. +1 −1 lib/route/link/veth.c
@@ -98,7 +98,7 @@ typedef enum {
#define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1)
-extern struct nla_policy link_policy[];
+extern struct nla_policy rtln_link_policy[];
extern struct rtnl_link *rtnl_link_alloc(void);
extern void rtnl_link_put(struct rtnl_link *);
View
@@ -262,7 +262,7 @@ static int link_clone(struct nl_object *_dst, struct nl_object *_src)
return 0;
}
-struct nla_policy link_policy[IFLA_MAX+1] = {
+struct nla_policy rtln_link_policy[IFLA_MAX+1] = {
[IFLA_IFNAME] = { .type = NLA_STRING,
.maxlen = IFNAMSIZ },
[IFLA_MTU] = { .type = NLA_U32 },
@@ -481,7 +481,7 @@ static int link_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
int err, family;
struct nla_policy real_link_policy[IFLA_MAX+1];
- memcpy(&real_link_policy, link_policy, sizeof(link_policy));
+ memcpy(&real_link_policy, rtln_link_policy, sizeof(rtln_link_policy));
link = rtnl_link_alloc();
if (link == NULL) {
View
@@ -65,7 +65,7 @@ static int veth_parse(struct rtnl_link *link, struct nlattr *data,
err = nla_parse(peer_tb, IFLA_MAX,
nla_data(nla_peer) + sizeof(struct ifinfomsg),
nla_len(nla_peer) - sizeof(struct ifinfomsg),
- link_policy);
+ rtln_link_policy);
if (err < 0)
goto errout;

0 comments on commit 2cf635b

Please sign in to comment.