From patchwork Thu Oct 4 18:14:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 189230 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 C90072C03A0 for ; Fri, 5 Oct 2012 04:15:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755121Ab2JDSPP (ORCPT ); Thu, 4 Oct 2012 14:15:15 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:38022 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754840Ab2JDSPM (ORCPT ); Thu, 4 Oct 2012 14:15:12 -0400 Received: by mail-we0-f174.google.com with SMTP id t9so510547wey.19 for ; Thu, 04 Oct 2012 11:15:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=ZbQjS9WMCoqU1YqvKzYsU/HNvevs9RA3w9zNiUOm9sY=; b=IHP2Y/WchAIuToI+n0wXU6XQ6R0xGhOHXcoeUSqjeBFQvC2Z7hGud486WhTocf7Fx7 e0UTWtZRqbw3akvkJg4qntSRIzEwKfFtFr6nrz/AFVFNqSKS3D/Dl3TZaPFWK4wqhtxm owhJzL8JgfLxZhtHswrmMHe1GRxX1+oUj/7U+vDu/v+oIYMgbGYiHmDAomk9fwRVz1P1 VSVJuwjw6XbHpCJYj3s+HEaqa85/sEkmtMBdbvOTmZ1dwv6ibYDB8FOBlKgr28cZWU9b 6dPVYoof6p8HIAlb/qt0Cq1sFiCj6Zvoxf0h5oEeVCgVSIXXjfgxriNeRac9Hxo948jn Qjqw== Received: by 10.180.87.42 with SMTP id u10mr14741458wiz.0.1349374511474; Thu, 04 Oct 2012 11:15:11 -0700 (PDT) Received: from localhost (nat-2.starnet.cz. [92.62.224.2]) by mx.google.com with ESMTPS id f1sm16043896wiy.2.2012.10.04.11.15.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 11:15:11 -0700 (PDT) From: Michal Simek To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Michal Simek , Anirudha Sarangi , John Linn , Grant Likely , Rob Herring , "David S. Miller" Subject: [PATCH 05/11] net: axienet: Enable VLAN support by default Date: Thu, 4 Oct 2012 20:14:51 +0200 Message-Id: <1349374497-9540-5-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1349374497-9540-1-git-send-email-monstr@monstr.eu> References: <1349374497-9540-1-git-send-email-monstr@monstr.eu> X-Gm-Message-State: ALoCoQnIVoaDVuyPA/MMZyVfINDbp9r6oFioiryWgVYm0GLV3als+pcA4c79QxtuyUwQUSt9K4SW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver is using frame size for VLAN packets but does not enable VLAN IP option. Signed-off-by: Michal Simek CC: Anirudha Sarangi CC: John Linn CC: Grant Likely CC: Rob Herring CC: David S. Miller --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 8d1db13..4ef148f 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -483,6 +483,7 @@ static void axienet_device_reset(struct net_device *ndev) __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET); lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE; + lp->options |= XAE_OPTION_VLAN; lp->options &= (~XAE_OPTION_JUMBO); if ((ndev->mtu > XAE_MTU) &&