Files
poky/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
Yu Ke 6a7b1fe1bb recipes: Add Upstream-Status for multiple recipes
iputils: update patch Upstream-Status
mktemp: update patch Upstream-Status
xinetd: update Upstream-Status
libdrm: update patch Upstream-Status
qemugl: update patch Upstream-Status
x11-common: update patch Upstream-Status
xorg-app: update patch Upstream-Status
xorg-driver: update patch Upstream-Status

(From OE-Core rev: 6c49b8e881bc811386c5f1ebac95829d44ad9bb3)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 10:28:59 +01:00

27 lines
812 B
Diff

Upstream-Status: Pending [from other distro Debian]
Index: trunk/arping.c
===================================================================
--- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700
+++ trunk/arping.c 2010-05-07 23:41:16.000000000 -0700
@@ -182,12 +182,17 @@
if (start.tv_sec==0)
start = tv;
- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500))
+ if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)
finish();
- if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
+ if ((!timeout) && (count == 0))
+ finish();
+
+ if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) {
send_pack(s, src, dst,
(struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he);
+ if (count >= 0)
+ count--;
if (count == 0 && unsolicited)
finish();
}