[PATCH 05/11] net: axienet: Enable VLAN support by default

[Michal Simek]

The driver is using frame size for VLAN packets
but does not enable VLAN IP option.

Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
CC: Anirudha Sarangi <anirudh@xxxxxxxxxx>
CC: John Linn <John.Linn@xxxxxxxxxx>
CC: Grant Likely <grant.likely@xxxxxxxxxxxx>
CC: Rob Herring <rob.herring@xxxxxxxxxxx>
CC: David S. Miller <davem@xxxxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/