linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andres Salomon <dilinger@collabora.co.uk>
To: linux-wireless@vger.kernel.org
Cc: Johannes Berg <johannes@sipsolutions.net>, akpm@linux-foundation.org
Subject: [PATCH 2/2] mac80211: give warning if building w/out rate ctrl algorithm
Date: Sun, 7 Feb 2010 21:48:37 -0500	[thread overview]
Message-ID: <20100207214837.027dfd3d@mycelium.queued.net> (raw)


I discovered that if EMBEDDED=y, one can accidentally build a mac80211 stack
w/ no rate control algorithm.  When RC_MINISTREL and RC_PID are both disabled,
the RC_DEFAULT string (which rate.c uses as the fallback algorithm) will be
"".  That'll cause the rate_control_alloc to fail, which will in turn cause
ieee80211_register_hw to fail.  IOW, no driver will load.

This will tell kconfig to provide a warning if no rate control algorithms
have been selected.  That'll at least warn the user that they're about to
build a broken wireless stack.

Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
---
 net/mac80211/Kconfig |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index a10d508..1f0ebab 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -15,8 +15,12 @@ comment "CFG80211 needs to be enabled for MAC80211"
 
 if MAC80211 != n
 
+config MAC80211_HAS_RC
+	def_bool n
+
 config MAC80211_RC_PID
 	bool "PID controller based rate control algorithm" if EMBEDDED
+	select MAC80211_HAS_RC
 	---help---
 	  This option enables a TX rate control algorithm for
 	  mac80211 that uses a PID controller to select the TX
@@ -24,12 +28,14 @@ config MAC80211_RC_PID
 
 config MAC80211_RC_MINSTREL
 	bool "Minstrel" if EMBEDDED
+	select MAC80211_HAS_RC
 	default y
 	---help---
 	  This option enables the 'minstrel' TX rate control algorithm
 
 choice
 	prompt "Default rate control algorithm"
+	depends on MAC80211_HAS_RC
 	default MAC80211_RC_DEFAULT_MINSTREL
 	---help---
 	  This option selects the default rate control algorithm
@@ -62,6 +68,9 @@ config MAC80211_RC_DEFAULT
 
 endif
 
+comment "mac80211 will not work properly w/out rate control algorithm"
+	depends on MAC80211_HAS_RC=n
+
 config MAC80211_MESH
 	bool "Enable mac80211 mesh networking (pre-802.11s) support"
 	depends on MAC80211 && EXPERIMENTAL
-- 
1.5.6.5


             reply	other threads:[~2010-02-08  2:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-08  2:48 Andres Salomon [this message]
2010-02-08  9:06 ` [PATCH 2/2] mac80211: give warning if building w/out rate ctrl algorithm Johannes Berg
2010-02-08 17:07   ` Andres Salomon
2010-02-09  8:00     ` Johannes Berg
2010-02-08  9:23 ` Kalle Valo
2010-02-08  9:27   ` Gábor Stefanik
2010-02-08 18:32 ` Luis R. Rodriguez
2010-02-14 23:18   ` Andres Salomon
2010-02-16 20:05     ` Luis R. Rodriguez
2010-02-16 20:07       ` John W. Linville

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=20100207214837.027dfd3d@mycelium.queued.net \
    --to=dilinger@collabora.co.uk \
    --cc=akpm@linux-foundation.org \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).