From patchwork Sat Feb 19 17:56:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83708 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A0D45B712D for ; Sun, 20 Feb 2011 04:56:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754508Ab1BSR4k (ORCPT ); Sat, 19 Feb 2011 12:56:40 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:33864 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754406Ab1BSR4j (ORCPT ); Sat, 19 Feb 2011 12:56:39 -0500 Received: from vapier.dokuwiki (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 9830F1B409A; Sat, 19 Feb 2011 17:56:38 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Subject: [PATCH] ping: fix building on older systems Date: Sat, 19 Feb 2011 12:56:37 -0500 Message-Id: <1298138197-27262-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.4.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The SO_MARK define is somewhat recent (linux-2.6.25), so check for its existence before we try to use it. Signed-off-by: Mike Frysinger --- ping_common.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ping_common.c b/ping_common.c index 82320b1..b4b26b2 100644 --- a/ping_common.c +++ b/ping_common.c @@ -475,6 +475,7 @@ void setup(int icmp_sock) fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n"); } #endif +#ifdef SO_MARK if (options & F_MARK) { if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)) == -1) { @@ -484,6 +485,7 @@ void setup(int icmp_sock) fprintf(stderr, "Warning: Failed to set mark %d\n", mark); } } +#endif /* Set some SNDTIMEO to prevent blocking forever * on sends, when device is too slow or stalls. Just put limit