From patchwork Wed Nov 25 10:04:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Riteau X-Patchwork-Id: 39296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0AACFB6F12 for ; Wed, 25 Nov 2009 21:07:35 +1100 (EST) Received: from localhost ([127.0.0.1]:43270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDEmX-0007of-2D for incoming@patchwork.ozlabs.org; Wed, 25 Nov 2009 05:07:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDEkH-0006yW-Qo for qemu-devel@nongnu.org; Wed, 25 Nov 2009 05:05:10 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDEkD-0006wL-6a for qemu-devel@nongnu.org; Wed, 25 Nov 2009 05:05:09 -0500 Received: from [199.232.76.173] (port=56503 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDEkC-0006wF-NG for qemu-devel@nongnu.org; Wed, 25 Nov 2009 05:05:04 -0500 Received: from mail1-relais-roc.national.inria.fr ([192.134.164.82]:8570) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1NDEkB-0008Dz-Po for qemu-devel@nongnu.org; Wed, 25 Nov 2009 05:05:04 -0500 X-IronPort-AV: E=Sophos;i="4.47,285,1257116400"; d="scan'208";a="40761954" Received: from elfe.irisa.fr (HELO localhost.localdomain) ([131.254.60.12]) by mail1-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 Nov 2009 11:04:59 +0100 From: Pierre Riteau To: qemu-devel@nongnu.org, Mark McLoughlin Date: Wed, 25 Nov 2009 11:04:42 +0100 Message-Id: <1259143482-17735-1-git-send-email-Pierre.Riteau@irisa.fr> X-Mailer: git-send-email 1.6.5 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Pierre Riteau Subject: [Qemu-devel] [PATCH] Check for TUNSETOFFLOAD support before trying to enable offload features X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This avoids the "TUNSETOFFLOAD ioctl() failed: Invalid argument" message on kernels without TUNSETOFFLOAD support. Signed-off-by: Pierre Riteau Acked-by: Mark McLoughlin --- net/tap-linux.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/net/tap-linux.c b/net/tap-linux.c index 0f621a2..e038e1a 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -129,6 +129,11 @@ void tap_fd_set_offload(int fd, int csum, int tso4, { unsigned int offload = 0; + /* Check if our kernel supports TUNSETOFFLOAD */ + if (ioctl(fd, TUNSETOFFLOAD, 0) != 0 && errno == EINVAL) { + return; + } + if (csum) { offload |= TUN_F_CSUM; if (tso4)