From patchwork Mon Apr 27 09:32:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Bunk X-Patchwork-Id: 26493 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4C0AAB6F44 for ; Mon, 27 Apr 2009 19:32:14 +1000 (EST) Received: by ozlabs.org (Postfix) id 3B6BFDDE31; Mon, 27 Apr 2009 19:32:14 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id D3CBDDDE2A for ; Mon, 27 Apr 2009 19:32:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752416AbZD0Jbl (ORCPT ); Mon, 27 Apr 2009 05:31:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752175AbZD0Jbl (ORCPT ); Mon, 27 Apr 2009 05:31:41 -0400 Received: from smtp5.welho.com ([213.243.153.39]:38490 "EHLO smtp5.welho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751763AbZD0Jbk (ORCPT ); Mon, 27 Apr 2009 05:31:40 -0400 Received: from localhost.pp.htv.fi (cs181212059.pp.htv.fi [82.181.212.59]) by smtp5.welho.com (Postfix) with ESMTP id 737EC5BC017 for ; Mon, 27 Apr 2009 12:31:39 +0300 (EEST) Date: Mon, 27 Apr 2009 12:32:07 +0300 From: Adrian Bunk To: netdev@vger.kernel.org Subject: [2.6 patch] fix LL_MAX_HEADER for CONFIG_TR_MODULE Message-ID: <20090427093207.GB9259@localhost.pp.htv.fi> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Unless I miss anything this should fix a bug. Signed-off-by: Adrian Bunk --- -- 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/include/linux/netdevice.h b/include/linux/netdevice.h index 2e7783f..453be9a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -104,7 +104,7 @@ struct wireless_dev; # else # define LL_MAX_HEADER 96 # endif -#elif defined(CONFIG_TR) +#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE) # define LL_MAX_HEADER 48 #else # define LL_MAX_HEADER 32