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 | 38 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.23.2.bb | 1 |
2 files changed, 39 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..dec5eb5cf1 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-zcip-fix-wrong-comparison-of-source-IP-with-our-IP.patch | |||
@@ -0,0 +1,38 @@ | |||
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 | |||
13 | This change was picked from Busybox without modification | ||
14 | (git://git.busybox.net/busybox, commit 4d15068) | ||
15 | |||
16 | Upstream-Status: Backport (added in 1.24) | ||
17 | Signed-off-by: Brad Mouring <brad.mouring@ni.com> | ||
18 | |||
19 | --- | ||
20 | networking/zcip.c | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/networking/zcip.c b/networking/zcip.c | ||
24 | index a3307c5..962ba2e 100644 | ||
25 | --- a/networking/zcip.c | ||
26 | +++ b/networking/zcip.c | ||
27 | @@ -521,7 +521,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv) | ||
28 | target_ip_conflict = 0; | ||
29 | |||
30 | if (memcmp(&p.arp.arp_sha, ð_addr, ETH_ALEN) != 0) { | ||
31 | - if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr))) { | ||
32 | + if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0) { | ||
33 | /* A probe or reply with source_ip == chosen ip */ | ||
34 | source_ip_conflict = 1; | ||
35 | } | ||
36 | -- | ||
37 | 2.7.3 | ||
38 | |||
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb index 7258df022b..5edcbfd8df 100644 --- a/meta/recipes-core/busybox/busybox_1.23.2.bb +++ b/meta/recipes-core/busybox/busybox_1.23.2.bb | |||
@@ -36,6 +36,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
36 | file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ | 36 | file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ |
37 | file://0002-Passthrough-r-to-linker.patch \ | 37 | file://0002-Passthrough-r-to-linker.patch \ |
38 | file://0001-randconfig-fix.patch \ | 38 | file://0001-randconfig-fix.patch \ |
39 | file://0001-zcip-fix-wrong-comparison-of-source-IP-with-our-IP.patch \ | ||
39 | file://mount-via-label.cfg \ | 40 | file://mount-via-label.cfg \ |
40 | file://sha1sum.cfg \ | 41 | file://sha1sum.cfg \ |
41 | file://sha256sum.cfg \ | 42 | file://sha256sum.cfg \ |