diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2013-07-22 17:08:05 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 13:08:59 +0100 |
commit | d921c0a0032a63cc1848726d5e31ed81fd6281d0 (patch) | |
tree | 3adbb05bbf147e53ddc8a165dd17ee7b32bcd4dc /meta/recipes-connectivity/connman/connman | |
parent | 4b5a21d86759be735721df7b86b6fb79e5ff2ffc (diff) | |
download | poky-d921c0a0032a63cc1848726d5e31ed81fd6281d0.tar.gz |
connman: upgrade to v1.16
inet-fix-ip-cleanup-functions.patch no longer nedded;
included in upstream.
(From OE-Core rev: 9c48963a67c9dfd46f1d76ed42a9bd35e8cc2c8c)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch b/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch deleted file mode 100644 index 3071549d95..0000000000 --- a/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 100353e10f60a50ca1ba78daa6bc4dfebf5b3297 Mon Sep 17 00:00:00 2001 | ||
2 | From: Constantin Musca <constantinx.musca@intel.com> | ||
3 | Date: Wed, 5 Dec 2012 15:07:21 +0200 | ||
4 | Subject: [PATCH] inet: fix ip cleanup functions | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
8 | --- | ||
9 | src/inet.c | 8 ++++++++ | ||
10 | 1 file changed, 8 insertions(+) | ||
11 | |||
12 | diff --git a/src/inet.c b/src/inet.c | ||
13 | index be69aca..e76a1f1 100644 | ||
14 | --- a/src/inet.c | ||
15 | +++ b/src/inet.c | ||
16 | @@ -626,6 +626,10 @@ int connman_inet_clear_ipv6_address(int index, const char *address, | ||
17 | |||
18 | DBG("index %d address %s prefix_len %d", index, address, prefix_len); | ||
19 | |||
20 | + if (address == NULL) { | ||
21 | + return -1; | ||
22 | + } | ||
23 | + | ||
24 | err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET6, | ||
25 | address, NULL, prefix_len, NULL); | ||
26 | if (err < 0) { | ||
27 | @@ -649,6 +653,10 @@ int connman_inet_clear_address(int index, struct connman_ipaddress *ipaddress) | ||
28 | |||
29 | DBG("index %d address %s prefix_len %d", index, address, prefix_len); | ||
30 | |||
31 | + if (address == NULL) { | ||
32 | + return -1; | ||
33 | + } | ||
34 | + | ||
35 | err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET, | ||
36 | address, peer, prefix_len, broadcast); | ||
37 | if (err < 0) { | ||
38 | -- | ||
39 | 1.7.11.7 | ||
40 | |||