aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-07-10 12:24:11 +0000
committerSaul Wold <sgw@linux.intel.com>2013-07-11 15:59:05 -0700
commit52ca4ac9f3af16fe99b28eaeaff8bb52f86eb24c (patch)
tree7ab2e8943420689fba0caf1bc6f8551b87fa8af3 /meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
parenta609771a7dc8a102f080d31526e795705154e514 (diff)
downloadopenembedded-core-contrib-52ca4ac9f3af16fe99b28eaeaff8bb52f86eb24c.tar.gz
iputils: Upgrade to v20121221
Removed obsolete patches Header for arping changed. New author added. Capability support enabled by default(upstream) -> added libcap to DEPENDS Gnutls enabled by default(upstream) -> switched from openssl to gnutls Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Diffstat (limited to 'meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff')
-rw-r--r--meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff26
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
deleted file mode 100644
index 3e34788a5a..0000000000
--- a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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();
- }