diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-zcip-fix-wrong-comparison-of-source-IP-with-our-IP.patch | 34 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.23.1.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-zcip-fix-wrong-comparison-of-source-IP-with-our-IP.patch b/meta/recipes-core/busybox/busybox/0001-zcip-fix-wrong-comparison-of-source-IP-with-our-IP.patch new file mode 100644 index 0000000000..83bd114e31 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-zcip-fix-wrong-comparison-of-source-IP-with-our-IP.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 4d15068d83054a9f82b3f8842706cd6deb401e25 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vladislav Grishenko <themiron@mail.ru> | ||
3 | Date: Thu, 19 Mar 2015 16:19:35 +0500 | ||
4 | Subject: [PATCH] zcip: fix wrong comparison of source IP with our IP | ||
5 | |||
6 | Commit "zcip: fix link-local IP conflict detection" has introduced | ||
7 | wrong comparsion of source IP with our IP. This leads to a new IP | ||
8 | being picked unnecessarily on every incoming ARP packet. | ||
9 | |||
10 | Signed-off-by: Vladislav Grishenko <themiron@mail.ru> | ||
11 | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | ||
12 | Signed-off-by: Brad Mouring <brad.mouring@ni.com> | ||
13 | |||
14 | Upstream-Status: Backport (4d15068, added in 1.24) | ||
15 | --- | ||
16 | networking/zcip.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/networking/zcip.c b/networking/zcip.c | ||
20 | index a3307c5..962ba2e 100644 | ||
21 | --- a/networking/zcip.c | ||
22 | +++ b/networking/zcip.c | ||
23 | @@ -521,7 +521,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv) | ||
24 | target_ip_conflict = 0; | ||
25 | |||
26 | if (memcmp(&p.arp.arp_sha, ð_addr, ETH_ALEN) != 0) { | ||
27 | - if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr))) { | ||
28 | + if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0) { | ||
29 | /* A probe or reply with source_ip == chosen ip */ | ||
30 | source_ip_conflict = 1; | ||
31 | } | ||
32 | -- | ||
33 | 2.7.3 | ||
34 | |||
diff --git a/meta/recipes-core/busybox/busybox_1.23.1.bb b/meta/recipes-core/busybox/busybox_1.23.1.bb index 7c3ed84394..2360fa9a96 100644 --- a/meta/recipes-core/busybox/busybox_1.23.1.bb +++ b/meta/recipes-core/busybox/busybox_1.23.1.bb | |||
@@ -30,6 +30,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
30 | file://login-utilities.cfg \ | 30 | file://login-utilities.cfg \ |
31 | file://recognize_connmand.patch \ | 31 | file://recognize_connmand.patch \ |
32 | file://busybox-cross-menuconfig.patch \ | 32 | file://busybox-cross-menuconfig.patch \ |
33 | file://0001-zcip-fix-wrong-comparison-of-source-IP-with-our-IP.patch \ | ||
33 | " | 34 | " |
34 | 35 | ||
35 | SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" | 36 | SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" |