diff options
author | Song.Li <Song.Li@windriver.com> | 2012-06-29 09:29:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-30 20:59:11 +0100 |
commit | 8c5bbbe9714c1646c98bdd801953b6efe099bf3f (patch) | |
tree | 3c9b5029ce3bec19fbfc46e77d5fabef09c700dd | |
parent | 2a8265950f263138fcb33db8dc9e1017a6af233a (diff) | |
download | poky-8c5bbbe9714c1646c98bdd801953b6efe099bf3f.tar.gz |
libnl: fix two parentheses bugs in lib/cache_mngr.c file
there are two parentheses bugs in libnl /lib/cache_mngr.c file.
The parentheses doesn't make any sense,
This will cause the variable err get a bool value,
the correct value of variable err should be the return value
of the function which can be any integer value.
(From OE-Core rev: b8bf6cc43dd08fcc7394053b31f03d5312ed239c)
Signed-off-by: Song Li <Song.Li@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch | 37 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_3.2.22.bb | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch b/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch new file mode 100644 index 0000000000..6b8fa106ca --- /dev/null +++ b/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 82fdf49c185fd5f3810781af9ef52aa6a52bf2df Mon Sep 17 00:00:00 2001 | ||
2 | From: "Song.Li" <Song.Li@windriver.com> | ||
3 | Date: Thu, 28 Jun 2012 20:03:17 +0800 | ||
4 | Subject: [PATCH] fix lib/cache_mngr.c two parentheses bugs | ||
5 | |||
6 | there are two parentheses bugs in libnl /lib/cache_mngr.c file. | ||
7 | The parentheses doesn't make any sense, | ||
8 | This will cause the variable err get a bool value, | ||
9 | the correct value of variable err should be the return value | ||
10 | of the function which can be any integer value. | ||
11 | |||
12 | --- | ||
13 | lib/cache_mngr.c | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | Upstream-status: Pending | ||
17 | |||
18 | diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c | ||
19 | index dae8768..57cc1f9 100644 | ||
20 | --- a/lib/cache_mngr.c | ||
21 | +++ b/lib/cache_mngr.c | ||
22 | @@ -150,10 +150,10 @@ int nl_cache_mngr_alloc(struct nl_sock *sk, int protocol, int flags, | ||
23 | /* Required to receive async event notifications */ | ||
24 | nl_socket_disable_seq_check(mngr->cm_sock); | ||
25 | |||
26 | - if ((err = nl_connect(mngr->cm_sock, protocol) < 0)) | ||
27 | + if ((err = nl_connect(mngr->cm_sock, protocol)) < 0) | ||
28 | goto errout; | ||
29 | |||
30 | - if ((err = nl_socket_set_nonblocking(mngr->cm_sock) < 0)) | ||
31 | + if ((err = nl_socket_set_nonblocking(mngr->cm_sock)) < 0) | ||
32 | goto errout; | ||
33 | |||
34 | NL_DBG(1, "Allocated cache manager %p, protocol %d, %d caches\n", | ||
35 | -- | ||
36 | 1.7.9.5 | ||
37 | |||
diff --git a/meta/recipes-support/libnl/libnl_3.2.22.bb b/meta/recipes-support/libnl/libnl_3.2.22.bb index 36e98e1f43..30f85b2995 100644 --- a/meta/recipes-support/libnl/libnl_3.2.22.bb +++ b/meta/recipes-support/libnl/libnl_3.2.22.bb | |||
@@ -11,7 +11,8 @@ DEPENDS = "flex-native bison-native" | |||
11 | 11 | ||
12 | SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ | 12 | SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ |
13 | file://fix-pktloc_syntax_h-race.patch \ | 13 | file://fix-pktloc_syntax_h-race.patch \ |
14 | file://fix-pc-file.patch " | 14 | file://fix-pc-file.patch \ |
15 | file://fix-lib-cache_mngr.c-two-parentheses-bugs.patch" | ||
15 | 16 | ||
16 | SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e" | 17 | SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e" |
17 | SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b" | 18 | SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b" |