From: Michal Simek <monstr@monstr.eu>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Michal Simek <monstr@monstr.eu>,
Anirudha Sarangi <anirudh@xilinx.com>,
John Linn <John.Linn@xilinx.com>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 05/11] net: axienet: Enable VLAN support by default
Date: Thu, 4 Oct 2012 20:14:51 +0200 [thread overview]
Message-ID: <1349374497-9540-5-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1349374497-9540-1-git-send-email-monstr@monstr.eu>
The driver is using frame size for VLAN packets
but does not enable VLAN IP option.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
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
next prev parent reply other threads:[~2012-10-04 18:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
2012-10-04 18:14 ` [PATCH 02/11] net: axienet: Add ioctl support Michal Simek
2012-10-04 19:17 ` Ben Hutchings
2012-10-05 5:54 ` Michal Simek
2012-10-04 18:14 ` [PATCH 03/11] net: axienet: Do not use NO_IRQ Michal Simek
2012-10-04 18:14 ` [PATCH 04/11] net: axienet: Additional MDIO clock functionality Michal Simek
2012-10-04 18:14 ` Michal Simek [this message]
2012-10-04 18:14 ` [PATCH 06/11] net: ll_temac: Fix mdio initialization Michal Simek
2012-10-04 18:14 ` [PATCH 07/11] net: ll_temac: Fix DMA map size bug Michal Simek
2012-10-04 18:14 ` [PATCH 08/11] net: ll_temac: Do not use fixed mtu size Michal Simek
2012-10-04 19:22 ` Ben Hutchings
2012-10-05 5:58 ` Michal Simek
2012-10-04 18:14 ` [PATCH 09/11] net: ll_temac: Move frag loading to frag loop Michal Simek
2012-10-04 18:14 ` [PATCH 10/11] net: ll_temac: Simplify xmit Michal Simek
2012-10-04 18:14 ` [PATCH 11/11] net: xilinx: Show csum in bootlog Michal Simek
2012-10-04 19:15 ` Ben Hutchings
2012-10-05 5:48 ` Michal Simek
2012-10-05 13:36 ` Ben Hutchings
2012-10-05 9:35 ` Michal Simek
2012-10-05 13:51 ` Ben Hutchings
2012-10-09 9:08 ` Michal Simek
2012-10-09 16:56 ` Ben Hutchings
2012-10-10 16:06 ` Michal Simek
2012-10-10 16:14 ` Ben Hutchings
2012-10-04 18:26 ` [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature David Miller
2012-10-05 5:22 ` Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349374497-9540-5-git-send-email-monstr@monstr.eu \
--to=monstr@monstr.eu \
--cc=John.Linn@xilinx.com \
--cc=anirudh@xilinx.com \
--cc=davem@davemloft.net \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rob.herring@calxeda.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).