From patchwork Mon Nov 28 20:56:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Staale.Aakermann@kongsberg.com X-Patchwork-Id: 128077 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id AF680100A80 for ; Tue, 29 Nov 2011 08:01:32 +1100 (EST) X-Greylist: delayed 310 seconds by postgrey-1.34 at bilbo; Tue, 29 Nov 2011 08:01:24 EST Received: from ukgl-edge-p01.kongsberg.com (ukgl-edge-p01.kongsberg.com [193.71.180.98]) by ozlabs.org (Postfix) with ESMTP id BDFCC1007D1 for ; Tue, 29 Nov 2011 08:01:23 +1100 (EST) Received: from UKGTW-EXM-P04.kda.kongsberg.com ([10.50.100.65]) by ukgl-edge-p01.kongsberg.com (8.14.1/8.14.1) with ESMTP id pASKu8L7026521 for ; Mon, 28 Nov 2011 21:56:09 +0100 Received: from UKGTW-EXM-P03.kda.kongsberg.com ([fe80::3c3d:7a3a:5c6:f2de]) by UKGTW-EXM-P04.kda.kongsberg.com ([fe80::78ee:e81d:8171:4f11%16]) with mapi id 14.01.0339.001; Mon, 28 Nov 2011 21:56:08 +0100 From: To: Subject: [PATCH] make gianfar eTSEC vlan hw acceleration work again. Thread-Topic: [PATCH] make gianfar eTSEC vlan hw acceleration work again. Thread-Index: AcyuD1R0N3nFn/FGQKWE8ro+K2njtg== Date: Mon, 28 Nov 2011 20:56:07 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [193.71.180.70] MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Hi. There seems to be a breakage in the VLAN TX HW acceleration in gianfar (kernel 3.1). It seems like the previous patch that was submitted forgotten to initialize the TX registers. After this patch, it seems vlan rx/tx for eTSEC works again. Best regards Staale Aakermann --- drivers/net/gianfar.c-orig 2011-11-28 11:04:09.318992481 +0100 +++ drivers/net/gianfar.c 2011-11-28 11:05:43.530990635 +0100 @@ -394,6 +394,9 @@ /* Init rctrl based on our settings */ gfar_write(®s->rctrl, rctrl); + if (ndev->features & NETIF_F_HW_VLAN_TX) + tctrl |= TCTRL_VLINS; + if (ndev->features & NETIF_F_IP_CSUM) tctrl |= TCTRL_INIT_CSUM;