From patchwork Tue Sep 20 20:48:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasper Pedersen X-Patchwork-Id: 115632 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 D5ED1B6F7F for ; Wed, 21 Sep 2011 07:26:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751322Ab1ITVZv (ORCPT ); Tue, 20 Sep 2011 17:25:51 -0400 Received: from n1.taur.dk ([217.198.219.102]:35328 "EHLO n1.taur.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750763Ab1ITVZu (ORCPT ); Tue, 20 Sep 2011 17:25:50 -0400 X-Greylist: delayed 2171 seconds by postgrey-1.27 at vger.kernel.org; Tue, 20 Sep 2011 17:25:49 EDT Received: from [IPv6:2002:50c7:1b7a:1:21d:60ff:fee0:10b0] ([IPv6:2002:50c7:1b7a:1:21d:60ff:fee0:10b0]) (authenticated bits=0) by n1.taur.dk (8.14.4/8.14.4) with ESMTP id p8KKnWu7004015 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Tue, 20 Sep 2011 22:49:33 +0200 Message-ID: <4E78FC38.7040903@kasperkp.dk> Date: Tue, 20 Sep 2011 22:48:56 +0200 From: Kasper Pedersen User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.20) Gecko/20110831 Fedora/3.1.12-2.fc14 Thunderbird/3.1.12 MIME-Version: 1.0 To: Matt Carlson , Michael Chan CC: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] tg3: fix VLAN tagging regression Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit 92cd3a17ce9c719abb4c28dee3438e0c641f8de4 tg3: Simplify tx bd assignments broke VLAN tagging on outbound packets. It ifdef'ed BCM_KERNEL_SUPPORTS_8021Q, but this is not set anywhere. So vlan never gets set, and all packets are sent with vlan=0. Change to use the CONFIG_VLAN_xxx defines instead. Tested on BCM5721 rev 11. Signed-off-by: Kasper Pedersen --- drivers/net/tg3.c | 2 +- 1 files changed, 1 insertions(+), 1 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/tg3.c b/drivers/net/tg3.c index dc3fbf6..a00d21b 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -6234,7 +6234,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) } } -#ifdef BCM_KERNEL_SUPPORTS_8021Q +#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) if (vlan_tx_tag_present(skb)) { base_flags |= TXD_FLAG_VLAN; vlan = vlan_tx_tag_get(skb);