From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Pirko Subject: Re: [PATCH] gianfar: fix bug caused by 87c288c6e9aa31720b72e2bc2d665e24e1653c3e Date: Tue, 26 Jul 2011 12:46:00 +0200 Message-ID: <20110726104559.GA2078@minipsycho.brq.redhat.com> References: <1311674593.17190.7.camel@DENEC1DT0191> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Linux Netdev To: Sebastian =?iso-8859-1?Q?P=F6hn?= Return-path: Received: from mx1.redhat.com ([209.132.183.28]:30555 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751883Ab1GZKqD (ORCPT ); Tue, 26 Jul 2011 06:46:03 -0400 Content-Disposition: inline In-Reply-To: <1311674593.17190.7.camel@DENEC1DT0191> Sender: netdev-owner@vger.kernel.org List-ID: Tue, Jul 26, 2011 at 12:03:13PM CEST, sebastian.belden@googlemail.com wrote: >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) How so? What's causing that? > >If VLAN insertion is requested (via ethtool) it will be set at an other point ... > >Signed-off-by: Sebastian Poehn >--- > > drivers/net/gianfar.c | 6 +----- > 1 files changed, 1 insertions(+), 5 deletions(-) > >diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c >index 835cd25..2659daa 100644 >--- a/drivers/net/gianfar.c >+++ b/drivers/net/gianfar.c >@@ -388,12 +388,8 @@ static void gfar_init_mac(struct net_device *ndev) > if (priv->hwts_rx_en) > rctrl |= RCTRL_PRSDEP_INIT | RCTRL_TS_ENABLE; > >- /* keep vlan related bits if it's enabled */ >- if (ndev->features & NETIF_F_HW_VLAN_TX) >- rctrl |= RCTRL_VLEX | RCTRL_PRSDEP_INIT; >- > if (ndev->features & NETIF_F_HW_VLAN_RX) >- tctrl |= TCTRL_VLINS; >+ rctrl |= RCTRL_VLEX | RCTRL_PRSDEP_INIT; > > /* Init rctrl based on our settings */ > gfar_write(®s->rctrl, rctrl); > > If you really need that to be done, you should remove NETIF_F_HW_VLAN_TX from features (not hw_features) (never add it).