From patchwork Tue Dec 7 02:23:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Randolf X-Patchwork-Id: 381302 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 oB72NTK1032754 for ; Tue, 7 Dec 2010 02:23:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754046Ab0LGCX0 (ORCPT ); Mon, 6 Dec 2010 21:23:26 -0500 Received: from mail30t.wh2.ocn.ne.jp ([125.206.180.136]:14285 "HELO mail30t.wh2.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752996Ab0LGCXX convert rfc822-to-8bit (ORCPT ); Mon, 6 Dec 2010 21:23:23 -0500 Received: from vs3014.wh2.ocn.ne.jp (125.206.180.187) by mail30t.wh2.ocn.ne.jp (RS ver 1.0.95vs) with SMTP id 5-0388498597 for ; Tue, 7 Dec 2010 11:23:21 +0900 (JST) Received: (qmail 19741 invoked from network); 7 Dec 2010 02:23:17 -0000 Received: from unknown (HELO tt-desk.localnet) (220.110.201.18) by with SMTP; 7 Dec 2010 02:23:17 -0000 From: Bruno Randolf To: "linux-wireless" Subject: build error without CONFIG_MAC80211_MESH Date: Tue, 7 Dec 2010 11:23:03 +0900 User-Agent: KMail/1.13.5 (Linux/2.6.35-23-generic; KDE/4.5.1; x86_64; ; ) Cc: linville@tuxdriver.com, Johannes Berg MIME-Version: 1.0 Message-Id: <201012071123.03046.br1@einfach.org> X-SF-Loop: 1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: 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 02:23:30 +0000 (UTC) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 40bd12e..3d988ca 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 */