From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754999Ab2JDSSA (ORCPT ); Thu, 4 Oct 2012 14:18:00 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:54728 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754844Ab2JDSPM (ORCPT ); Thu, 4 Oct 2012 14:15:12 -0400 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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) && -- 1.7.0.4