Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libnl/files: libnl-3.2.24_rc1-link_policy.patch
Date: Fri, 03 Jan 2014 06:36:05
Message-Id: 20140103063600.369BA2004C@flycatcher.gentoo.org
1 jer 14/01/03 06:36:00
2
3 Added: libnl-3.2.24_rc1-link_policy.patch
4 Log:
5 Add upstream patch (bug #494890 by Alex Barker).
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.1 dev-libs/libnl/files/libnl-3.2.24_rc1-link_policy.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/files/libnl-3.2.24_rc1-link_policy.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/files/libnl-3.2.24_rc1-link_policy.patch?rev=1.1&content-type=text/plain
14
15 Index: libnl-3.2.24_rc1-link_policy.patch
16 ===================================================================
17 --- a/include/netlink/route/link.h
18 +++ b/include/netlink/route/link.h
19 @@ -98,7 +98,7 @@ typedef enum {
20
21 #define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1)
22
23 -extern struct nla_policy link_policy[];
24 +extern struct nla_policy rtln_link_policy[];
25
26 extern struct rtnl_link *rtnl_link_alloc(void);
27 extern void rtnl_link_put(struct rtnl_link *);
28 --- a/lib/route/link.c
29 +++ b/lib/route/link.c
30 @@ -262,7 +262,7 @@ static int link_clone(struct nl_object *_dst, struct nl_object *_src)
31 return 0;
32 }
33
34 -struct nla_policy link_policy[IFLA_MAX+1] = {
35 +struct nla_policy rtln_link_policy[IFLA_MAX+1] = {
36 [IFLA_IFNAME] = { .type = NLA_STRING,
37 .maxlen = IFNAMSIZ },
38 [IFLA_MTU] = { .type = NLA_U32 },
39 @@ -481,7 +481,7 @@ static int link_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
40 int err, family;
41 struct nla_policy real_link_policy[IFLA_MAX+1];
42
43 - memcpy(&real_link_policy, link_policy, sizeof(link_policy));
44 + memcpy(&real_link_policy, rtln_link_policy, sizeof(rtln_link_policy));
45
46 link = rtnl_link_alloc();
47 if (link == NULL) {
48 --- a/lib/route/link/veth.c
49 +++ b/lib/route/link/veth.c
50 @@ -65,7 +65,7 @@ static int veth_parse(struct rtnl_link *link, struct nlattr *data,
51 err = nla_parse(peer_tb, IFLA_MAX,
52 nla_data(nla_peer) + sizeof(struct ifinfomsg),
53 nla_len(nla_peer) - sizeof(struct ifinfomsg),
54 - link_policy);
55 + rtln_link_policy);
56 if (err < 0)
57 goto errout;