| Message ID | 533D25D4.4000607@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Zhu, On Thu, Apr 03, 2014 at 05:11:48PM +0800, zhuyj wrote: > Hi, Claudiu > > Please help to review this patch. This patch is for kernel 2.6.x. Thanks > a lot. > > Hi, Willy > > Please help to merge this patch to longterm: 2.6.32.61 since this > problem also occurs on this kernel. Thanks a lot. Could you please send the reference to the equivalent mainline commit (the one which disables the tx vlan feature I'm assuming) ? I'll happily queue it for 2.6.32.62. Thanks, Willy -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/03/2014 05:27 PM, Willy Tarreau wrote: > Hi Zhu, > > On Thu, Apr 03, 2014 at 05:11:48PM +0800, zhuyj wrote: >> Hi, Claudiu >> >> Please help to review this patch. This patch is for kernel 2.6.x. Thanks >> a lot. >> >> Hi, Willy >> >> Please help to merge this patch to longterm: 2.6.32.61 since this >> problem also occurs on this kernel. Thanks a lot. > Could you please send the reference to the equivalent mainline commit (the one > which disables the tx vlan feature I'm assuming) ? I'll happily queue it for > 2.6.32.62. > > Thanks, > Willy > > Hi, Willy I reference the following 2 mainline commits. These 2 commits are based on the current kernel 3.x and ethtool. If we only backport these 2 commits on kernel 2.6.x, this problem will not be fixed yet. Best Regards! Zhu Yanjun 1. commit 87c288c6e9aa31720b72e2bc2d665e24e1653c3e Author: Jiri Pirko <jpirko@redhat.com> Date: Wed Jul 20 04:54:19 2011 +0000 gianfar: do vlan cleanup - unify vlan and nonvlan rx path - kill priv->vlgrp and gfar_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/gianfar.c | 55 ++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 26 deletions(-) 2.commit b852b720877e6b8e12b95a7cb4e00ea351b8cbfc Author: Sebastian Pöhn <sebastian.belden@googlemail.com> Date: Tue Jul 26 00:03:13 2011 +0000 gianfar: fix bug caused by 87c288c6e9aa31720b72e2bc2d665e24e1653c3e commit 87c288c6e9aa31720b72e2bc2d665e24e1653c3e "gianfar: do vlan cleanup" has two issues: # permutation of rx and tx flags # enabling vlan tag insertion by default (this leads to unusable connections on some configurations) If VLAN insertion is requested (via ethtool) it will be set at an other point ... Signed-off-by: Sebastian Poehn <sebastian.poehn@belden.com> Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/gianfar.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Zhu, On Thu, Apr 03, 2014 at 05:57:53PM +0800, zhuyj wrote: > I reference the following 2 mainline commits. These 2 commits are based > on the current kernel 3.x and ethtool. > If we only backport these 2 commits on kernel 2.6.x, this problem will > not be fixed yet. OK fine, I just wanted that we keep the reference of these equivalent patches in the commit message so that if later a newer patch changes anything they did, at least we have some indications that the commit might also have to be revisited. I'll merge your patch and put these references there. Thanks, Willy -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/03/2014 06:01 PM, Willy Tarreau wrote: > Hi Zhu, > > On Thu, Apr 03, 2014 at 05:57:53PM +0800, zhuyj wrote: >> I reference the following 2 mainline commits. These 2 commits are based >> on the current kernel 3.x and ethtool. >> If we only backport these 2 commits on kernel 2.6.x, this problem will >> not be fixed yet. > OK fine, I just wanted that we keep the reference of these equivalent > patches in the commit message so that if later a newer patch changes > anything they did, at least we have some indications that the commit > might also have to be revisited. > > I'll merge your patch and put these references there. > > Thanks, > Willy OK. Thanks a lot. Zhu Yanjun > . > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From afd48fa3ad5b15d519adeb19b2a9c00051327c68 Mon Sep 17 00:00:00 2001 From: Zhu Yanjun <Yanjun.Zhu@windriver.com> Date: Thu, 3 Apr 2014 16:41:13 +0800 Subject: [PATCH 1/1] gianfar: disable TX vlan based on kernel 2.6.x Since there is something wrong with tx vlan of gianfar nic driver, on kernel(3.0+), tx vlan is disabled. But on kernel 2.6.x, tx vlan is still enabled. Thus,gianfar nic driver can not support vlan packets and non-vlan packets. Signed-off-by: Zhu Yanjun <Yanjun.Zhu@windriver.com> --- drivers/net/gianfar.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 934a28f..8aa2cf6 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -365,7 +365,7 @@ static int gfar_probe(struct of_device *ofdev, priv->vlgrp = NULL; if (priv->device_flags & FSL_GIANFAR_DEV_HAS_VLAN) - dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; + dev->features |= NETIF_F_HW_VLAN_RX; if (priv->device_flags & FSL_GIANFAR_DEV_HAS_EXTENDED_HASH) { priv->extended_hash = 1; @@ -1451,12 +1451,6 @@ static void gfar_vlan_rx_register(struct net_device *dev, priv->vlgrp = grp; if (grp) { - /* Enable VLAN tag insertion */ - tempval = gfar_read(&priv->regs->tctrl); - tempval |= TCTRL_VLINS; - - gfar_write(&priv->regs->tctrl, tempval); - /* Enable VLAN tag extraction */ tempval = gfar_read(&priv->regs->rctrl); tempval |= (RCTRL_VLEX | RCTRL_PRSDEP_INIT); -- 1.7.9.5