* [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x
@ 2014-10-15 10:00 Zhu Yanjun
2014-10-15 10:00 ` [PATCH] gianfar: disable vlan tag insertion by default Zhu Yanjun
2014-10-15 10:09 ` [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x Willy Tarreau
0 siblings, 2 replies; 6+ messages in thread
From: Zhu Yanjun @ 2014-10-15 10:00 UTC (permalink / raw)
To: sandeep.kumar, netdev, linux-kernel, Yue.Tao, guang.yang, joe,
festevam, richardcochran, clarocq, yongjun_wei, claudiu.manoil, w,
roy.xu, sky.wangfeng, zyjzyj2000
Cc: 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.
Zhu Yanjun (1):
gianfar: disable vlan tag insertion by default
drivers/net/gianfar.c | 6 ------
1 file changed, 6 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] gianfar: disable vlan tag insertion by default
2014-10-15 10:00 [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x Zhu Yanjun
@ 2014-10-15 10:00 ` Zhu Yanjun
2014-10-15 10:09 ` [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x Willy Tarreau
1 sibling, 0 replies; 6+ messages in thread
From: Zhu Yanjun @ 2014-10-15 10:00 UTC (permalink / raw)
To: sandeep.kumar, netdev, linux-kernel, Yue.Tao, guang.yang, joe,
festevam, richardcochran, clarocq, yongjun_wei, claudiu.manoil, w,
roy.xu, sky.wangfeng, zyjzyj2000
Cc: Zhu Yanjun
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 <roy.xu@huawei.com>
Suggested-by: Wang Feng <sky.wangfeng@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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x
2014-10-15 10:00 [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x Zhu Yanjun
2014-10-15 10:00 ` [PATCH] gianfar: disable vlan tag insertion by default Zhu Yanjun
@ 2014-10-15 10:09 ` Willy Tarreau
2014-10-15 10:15 ` yzhu1
1 sibling, 1 reply; 6+ messages in thread
From: Willy Tarreau @ 2014-10-15 10:09 UTC (permalink / raw)
To: Zhu Yanjun
Cc: sandeep.kumar, netdev, linux-kernel, Yue.Tao, guang.yang, joe,
festevam, richardcochran, clarocq, yongjun_wei, claudiu.manoil,
roy.xu, sky.wangfeng, Zhu Yanjun
Hi Zhu,
On Wed, Oct 15, 2014 at 06:00:33PM +0800, Zhu Yanjun wrote:
> 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
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x
2014-10-15 10:09 ` [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x Willy Tarreau
@ 2014-10-15 10:15 ` yzhu1
2014-10-15 10:22 ` zhuyj
0 siblings, 1 reply; 6+ messages in thread
From: yzhu1 @ 2014-10-15 10:15 UTC (permalink / raw)
To: Willy Tarreau, Zhu Yanjun
Cc: sandeep.kumar, netdev, linux-kernel, Yue.Tao, guang.yang, joe,
festevam, richardcochran, clarocq, yongjun_wei, claudiu.manoil,
roy.xu, sky.wangfeng, zhuyj
On 10/15/2014 06:09 PM, Willy Tarreau wrote:
> Hi Zhu,
>
> On Wed, Oct 15, 2014 at 06:00:33PM +0800, Zhu Yanjun wrote:
>> 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
> 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
>
Hi, Willy
Sorry. Please apply the patch in the other one with this commit message.
Thanks a lot.
Zhu Yanjun
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x
2014-10-15 10:15 ` yzhu1
@ 2014-10-15 10:22 ` zhuyj
2014-10-15 12:01 ` Willy Tarreau
0 siblings, 1 reply; 6+ messages in thread
From: zhuyj @ 2014-10-15 10:22 UTC (permalink / raw)
To: yzhu1, Willy Tarreau
Cc: sandeep.kumar, netdev, linux-kernel, Yue.Tao, guang.yang, joe,
festevam, richardcochran, clarocq, yongjun_wei, claudiu.manoil,
roy.xu, sky.wangfeng, zhuyj
[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]
On 10/15/2014 06:15 PM, yzhu1 wrote:
> On 10/15/2014 06:09 PM, Willy Tarreau wrote:
>> Hi Zhu,
>>
>> On Wed, Oct 15, 2014 at 06:00:33PM +0800, Zhu Yanjun wrote:
>>> 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
>> 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
>>
> Hi, Willy
>
> Sorry. Please apply the patch in the other one with this commit message.
>
> Thanks a lot.
> Zhu Yanjun
>
Hi, Willy
Sorry, it is my fault. Please apply this patch in the attachment.
Thanks a lot.
Zhu Yanjun
[-- Attachment #2: 0001-gianfar-disable-vlan-tag-insertion-by-default.patch --]
[-- Type: text/x-patch, Size: 1687 bytes --]
>From 48cb11f57e363e8831c4bcaa854d6df23ca300f7 Mon Sep 17 00:00:00 2001
From: Zhu Yanjun <Yanjun.Zhu@windriver.com>
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 <roy.xu@huawei.com>
Suggested-by: Wang Feng <sky.wangfeng@huawei.com>
Signed-off-by: Zhu Yanjun <Yanjun.Zhu@windriver.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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x
2014-10-15 10:22 ` zhuyj
@ 2014-10-15 12:01 ` Willy Tarreau
0 siblings, 0 replies; 6+ messages in thread
From: Willy Tarreau @ 2014-10-15 12:01 UTC (permalink / raw)
To: zhuyj
Cc: yzhu1, sandeep.kumar, netdev, linux-kernel, Yue.Tao, guang.yang,
joe, festevam, richardcochran, clarocq, yongjun_wei,
claudiu.manoil, roy.xu, sky.wangfeng
Hi,
On Wed, Oct 15, 2014 at 06:22:24PM +0800, zhuyj wrote:
> Sorry, it is my fault.
no problem, don't worry :-)
> Please apply this patch in the attachment.
Thank you, patch queued now!
Willy
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-15 12:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-15 10:00 [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x Zhu Yanjun
2014-10-15 10:00 ` [PATCH] gianfar: disable vlan tag insertion by default Zhu Yanjun
2014-10-15 10:09 ` [PATCH] gianfar: disable vlan tag insertion by default on 2.6.x Willy Tarreau
2014-10-15 10:15 ` yzhu1
2014-10-15 10:22 ` zhuyj
2014-10-15 12:01 ` Willy Tarreau
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).