From patchwork Wed Aug 1 15:45:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 174478 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 C8ACB2C0083 for ; Thu, 2 Aug 2012 01:45:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755579Ab2HAPpl (ORCPT ); Wed, 1 Aug 2012 11:45:41 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:51067 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755472Ab2HAPpb (ORCPT ); Wed, 1 Aug 2012 11:45:31 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 7A3E21B402F; Wed, 1 Aug 2012 15:45:30 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Subject: [PATCH 4/6] ping: fix building on older systems Date: Wed, 1 Aug 2012 11:45:26 -0400 Message-Id: <1343835928-21541-4-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1343835928-21541-1-git-send-email-vapier@gentoo.org> References: <1343835928-21541-1-git-send-email-vapier@gentoo.org> 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 file changed, 2 insertions(+) diff --git a/ping_common.c b/ping_common.c index 287d0e6..6fd252d 100644 --- a/ping_common.c +++ b/ping_common.c @@ -486,6 +486,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) { @@ -499,6 +500,7 @@ void setup(int icmp_sock) #endif } } +#endif /* Set some SNDTIMEO to prevent blocking forever * on sends, when device is too slow or stalls. Just put limit