From 2143af36b32c5e1abe77dfafb6e0747460ab75e2 Mon Sep 17 00:00:00 2001 From: Zhu Yanjun Date: Wed, 15 Oct 2014 16:52:51 +0800 Subject: [PATCH] gianfar: disable vlan tag insertion by default 2.6.x kernels require a similar logic change as commit 51b8cbfc [gianfar: fix bug caused by e1653c3e] introduces for newer kernels. Gianfar driver originally enables vlan tag insertion by default. This will lead to unusable connections on some configurations. Since gianfar nic vlan tag insertion is disabled by default and it is not enabled any longer, it is not necessary to disable it again. Reported-by: Xu Jianrong Suggested-by: Wang Feng Signed-off-by: Zhu Yanjun Signed-off-by: Willy Tarreau --- drivers/net/gianfar.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 8aa2cf67fc856..afdcb419da3c9 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1115,7 +1115,6 @@ int startup_gfar(struct net_device *dev) /* keep vlan related bits if it's enabled */ if (priv->vlgrp) { rctrl |= RCTRL_VLEX | RCTRL_PRSDEP_INIT; - tctrl |= TCTRL_VLINS; } /* Init rctrl based on our settings */ @@ -1456,11 +1455,6 @@ static void gfar_vlan_rx_register(struct net_device *dev, tempval |= (RCTRL_VLEX | RCTRL_PRSDEP_INIT); gfar_write(&priv->regs->rctrl, tempval); } else { - /* Disable VLAN tag insertion */ - tempval = gfar_read(&priv->regs->tctrl); - tempval &= ~TCTRL_VLINS; - gfar_write(&priv->regs->tctrl, tempval); - /* Disable VLAN tag extraction */ tempval = gfar_read(&priv->regs->rctrl); tempval &= ~RCTRL_VLEX; -- 2.47.2