From patchwork Tue Dec  7 18:41:47 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Javier Cardona <javier@cozybit.com>
X-Patchwork-Id: 383912
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB7Ig2xL006647
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Tue, 7 Dec 2010 18:42:04 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753912Ab0LGSl6 (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Tue, 7 Dec 2010 13:41:58 -0500
Received: from mail-gw0-f42.google.com ([74.125.83.42]:35311 "EHLO
	mail-gw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753849Ab0LGSl6 (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Tue, 7 Dec 2010 13:41:58 -0500
Received: by gwb20 with SMTP id 20so254835gwb.1
	for <linux-wireless@vger.kernel.org>;
	Tue, 07 Dec 2010 10:41:57 -0800 (PST)
Received: by 10.150.218.7 with SMTP id q7mr2455838ybg.4.1291747316702;
	Tue, 07 Dec 2010 10:41:56 -0800 (PST)
Received: from localhost.localdomain
	(adsl-99-114-136-65.dsl.pltn13.sbcglobal.net [99.114.136.65])
	by mx.google.com with ESMTPS id r6sm331273yba.11.2010.12.07.10.41.54
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Tue, 07 Dec 2010 10:41:56 -0800 (PST)
From: Javier Cardona <javier@cozybit.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: Bruno Randolf <br1@einfach.org>, Larry Finger <Larry.Finger@lwfinger.net>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Javier Cardona <javier@cozybit.com>,
	Steve Derosier <steve@cozybit.com>, devel@lists.open80211s.org,
	Johannes Berg <johannes@sipsolutions.net>, linux-wireless@vger.kernel.org
Subject: [PATCH] mac80211: Fix compilation error when mesh is disabled
Date: Tue,  7 Dec 2010 10:41:47 -0800
Message-Id: <1291747307-15159-1-git-send-email-javier@cozybit.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1291746592.3607.53.camel@jlt3.sipsolutions.net>
References: <1291746592.3607.53.camel@jlt3.sipsolutions.net>
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 07 Dec 2010 18:42:04 +0000 (UTC)


diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 2de6976..973fee9 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -245,10 +245,12 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
 				sdata->vif.bss_conf.enable_beacon =
 					!!sdata->u.ibss.presp;
 				break;
+#ifdef CONFIG_MAC80211_MESH
 			case NL80211_IFTYPE_MESH_POINT:
 				sdata->vif.bss_conf.enable_beacon =
 					!!sdata->u.mesh.mesh_id_len;
 				break;
+#endif
 			default:
 				/* not reached */
 				WARN_ON(1);