From patchwork Wed Nov 5 12:36:27 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 7330 X-Patchwork-Delegate: jgarzik@pobox.com 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.176.167]) by ozlabs.org (Postfix) with ESMTP id BB0C2DDE1A for ; Wed, 5 Nov 2008 23:37:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755176AbYKEMh3 (ORCPT ); Wed, 5 Nov 2008 07:37:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755081AbYKEMh3 (ORCPT ); Wed, 5 Nov 2008 07:37:29 -0500 Received: from mail04.svc.cra.dublin.eircom.net ([159.134.118.20]:37062 "HELO mail04.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754911AbYKEMh2 (ORCPT ); Wed, 5 Nov 2008 07:37:28 -0500 Received: (qmail 63802 messnum 3163740 invoked from network[83.71.38.82/83-71-38-82.b-ras1.srl.dublin.eircom.net]); 5 Nov 2008 12:37:26 -0000 Received: from 83-71-38-82.b-ras1.srl.dublin.eircom.net (HELO blaa.localdomain) (83.71.38.82) by mail04.svc.cra.dublin.eircom.net (qp 63802) with SMTP; 5 Nov 2008 12:37:26 -0000 Received: by blaa.localdomain (Postfix, from userid 500) id 97EBB1BC011; Wed, 5 Nov 2008 12:36:27 +0000 (GMT) From: Mark McLoughlin To: netdev@vger.kernel.org Cc: Rusty Russell , Max Krasnyansky , Mark McLoughlin Subject: [PATCH] tun: don't set NETIF_F_FRAGLIST Date: Wed, 5 Nov 2008 12:36:27 +0000 Message-Id: <1225888587-1387-1-git-send-email-markmc@redhat.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <> References: <> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We don't handle skb_shared_info->frag_list, so we shouldn't be setting the NETIF_F_FRAGLIST flag. Signed-off-by: Mark McLoughlin --- drivers/net/tun.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 33b6d1b..7f9084c 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -844,11 +844,11 @@ static int set_offload(struct net_device *dev, unsigned long arg) old_features = dev->features; /* Unset features, set them as we chew on the arg. */ - features = (old_features & ~(NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST + features = (old_features & ~(NETIF_F_HW_CSUM|NETIF_F_SG |NETIF_F_TSO_ECN|NETIF_F_TSO|NETIF_F_TSO6)); if (arg & TUN_F_CSUM) { - features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST; + features |= NETIF_F_HW_CSUM|NETIF_F_SG; arg &= ~TUN_F_CSUM; if (arg & (TUN_F_TSO4|TUN_F_TSO6)) {