From: "John W. Linville" <linville@tuxdriver.com>
To: linux-wireless@vger.kernel.org
Cc: Javier Cardona <javier@cozybit.com>,
Bruno Randolf <br1@einfach.org>,
Larry Finger <Larry.Finger@lwfinger.net>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Steve Derosier <steve@cozybit.com>,
devel@lists.open80211s.org,
"John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH] cfg80211/mac80211: fix-up mesh join/leave build breakage
Date: Tue, 7 Dec 2010 13:38:34 -0500 [thread overview]
Message-ID: <1291747114-25476-1-git-send-email-linville@tuxdriver.com> (raw)
In-Reply-To: <1291746592.3607.53.camel@jlt3.sipsolutions.net>
From: Javier Cardona <javier@cozybit.com>
Fix-up build breakage from "cfg80211/mac80211: add mesh join/leave
commands" (commit 29cbe68c516a48a9a88b3226878570c6cbd83c02).
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
net/mac80211/main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
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);
--
1.7.3.2
next prev parent reply other threads:[~2010-12-07 18:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-07 18:22 [PATCH v4] cfg80211/mac80211: add mesh join/leave commands Javier Cardona
2010-12-07 18:29 ` Johannes Berg
2010-12-07 18:35 ` Javier Cardona
2010-12-07 18:38 ` John W. Linville [this message]
2010-12-07 18:41 ` [PATCH] mac80211: Fix compilation error when mesh is disabled Javier Cardona
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291747114-25476-1-git-send-email-linville@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=Larry.Finger@lwfinger.net \
--cc=br1@einfach.org \
--cc=devel@lists.open80211s.org \
--cc=javier@cozybit.com \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=steve@cozybit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox