From patchwork Tue Jul 26 10:03:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian =?ISO-8859-1?Q?P=F6hn?= X-Patchwork-Id: 106822 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3F6AAB70BF for ; Tue, 26 Jul 2011 20:03:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752686Ab1GZKDT (ORCPT ); Tue, 26 Jul 2011 06:03:19 -0400 Received: from mail-ey0-f171.google.com ([209.85.215.171]:33414 "EHLO mail-ey0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752627Ab1GZKDS (ORCPT ); Tue, 26 Jul 2011 06:03:18 -0400 Received: by eye22 with SMTP id 22so381046eye.2 for ; Tue, 26 Jul 2011 03:03:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=UBWAIZN7x7uu2vm6Z+7fRfW3hzwe/2EjeYpj1IeegFQ=; b=VVH6LTodqmxiPplFz39WmKTNO0XIC/vsjZjUTrFMvzM7Y5ik8UbF30+P5He05lIGni J+z/RkZlWwAEmMG0+DlL2Zf0akdzUSfuO28wVOeNKh4kk7W08jciQSqgV3iDLRf39XF5 cbYPl8mxGwTzY4Scoa7bRsyOFd4MnjT+jw/ek= Received: by 10.204.5.206 with SMTP id 14mr1307758bkw.181.1311674597103; Tue, 26 Jul 2011 03:03:17 -0700 (PDT) Received: from [10.254.252.2] (www.sepf.de [85.214.26.41]) by mx.google.com with ESMTPS id z23sm124702bks.10.2011.07.26.03.03.15 (version=SSLv3 cipher=OTHER); Tue, 26 Jul 2011 03:03:16 -0700 (PDT) Subject: [PATCH] gianfar: fix bug caused by 87c288c6e9aa31720b72e2bc2d665e24e1653c3e From: "Sebastian =?ISO-8859-1?Q?P=F6hn?=" To: Linux Netdev , jpirko@redhat.com Date: Tue, 26 Jul 2011 12:03:13 +0200 Message-ID: <1311674593.17190.7.camel@DENEC1DT0191> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/gianfar.c | 6 +----- 1 files changed, 1 insertions(+), 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 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);