[PATCH] gianfar: disable vlan tag insertion by default on 2.6.x

Discussion:

Zhu Yanjun

2014-10-15 10:00:33 UTC

In commit f43c75d4b6[gianfar: disable TX vlan based on kernel 2.6.x],
gianfar nic disables TX vlan. But gianfar nic enables vlan tag
insertion by default. This will lead to unusable connections on
some configurations. Since vlan tag insertion is disabled by default
and it is not enabled any longer, it is not necessary to disable it again.

Zhu Yanjun (1):
gianfar: disable vlan tag insertion by default

drivers/net/gianfar.c | 6 ------
1 file changed, 6 deletions(-)

--
1.9.1

Zhu Yanjun

2014-10-15 10:00:34 UTC

Permalink

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 <***@huawei.com>
Suggested-by: Wang Feng <***@huawei.com>
---
drivers/net/gianfar.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 8aa2cf6..afdcb41 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;

--
1.9.1

Willy Tarreau

2014-10-15 10:09:49 UTC

Permalink

Hi Zhu,

Post by Zhu Yanjun
In commit f43c75d4b6[gianfar: disable TX vlan based on kernel 2.6.x],
gianfar nic disables TX vlan. But gianfar nic enables vlan tag
insertion by default. This will lead to unusable connections on
some configurations. Since vlan tag insertion is disabled by default
and it is not enabled any longer, it is not necessary to disable it again.
gianfar: disable vlan tag insertion by default
drivers/net/gianfar.c | 6 ------
1 file changed, 6 deletions(-)
--
1.9.1

There's no patch in this e-mail. Since you sent another e-mail with almost
the same subject, I'm confused, it's unclear to me whether I only need to
apply the patch in the other one with this commit message or if it's just
that you accidently dropped the patch when sending this e-mail. Could you
please enlighten me ?

Thanks,
Willy

yzhu1

2014-10-15 10:15:37 UTC

Permalink

Post by Willy Tarreau
Hi Zhu,