[PATCH 05/11] net: axienet: Enable VLAN support by default
flat view
STALE5114d
From: Michal Simek <monstr@monstr.eu>
Date: 2012-10-04 18:18:00
Also in:
lkml
Subsystem:
networking drivers, the rest, xilinx axi ethernet driver · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Radhey Shyam Pandey
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 <redacted> CC: John Linn <redacted> CC: Grant Likely <redacted> CC: Rob Herring <redacted> 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