From: Daniel Golle <dgolle@allnet.de>
To: <linux-wireless@vger.kernel.org>
Cc: <users@rt2x00.serialmonkey.com>, <juhosg@openwrt.org>,
<sgruszka@redhat.com>, <helmut.schaa@googlemail.com>,
<gwingerde@gmail.com>, <john@phrozen.org>
Subject: [PATCH 2/3] rt2x00: allow disabling bands through platform_data
Date: Tue, 11 Dec 2012 12:04:07 +0200 [thread overview]
Message-ID: <20121211100404.GA7817@earthship.arig> (raw)
[-- Attachment #1: Type: text/plain, Size: 1803 bytes --]
Signed-off-by: Daniel Golle <dgolle@allnet.de>
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 355cff5..c67e769 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -426,6 +426,7 @@ struct hw_mode_spec {
unsigned int supported_bands;
#define SUPPORT_BAND_2GHZ 0x00000001
#define SUPPORT_BAND_5GHZ 0x00000002
+#define SUPPORT_BAND_BOTH (SUPPORT_BAND_2GHZ | SUPPORT_BAND_5GHZ)
unsigned int supported_rates;
#define SUPPORT_RATE_CCK 0x00000001
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index d454488..b7856bf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -835,6 +835,22 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
unsigned int num_rates;
unsigned int i;
+ if (rt2x00dev->dev->platform_data) {
+ struct rt2x00_platform_data *pdata;
+
+ pdata = rt2x00dev->dev->platform_data;
+ if (pdata->disable_2ghz)
+ spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
+ if (pdata->disable_5ghz)
+ spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
+ }
+
+ if ((spec->supported_bands & SUPPORT_BAND_BOTH) == 0) {
+ ERROR(rt2x00dev, "No supported bands\n");
+ return -EINVAL;
+ }
+
+
num_rates = 0;
if (spec->supported_rates & SUPPORT_RATE_CCK)
num_rates += 4;
diff --git a/include/linux/rt2x00_platform.h b/include/linux/rt2x00_platform.h
index 80effa7..b4c7768 100644
--- a/include/linux/rt2x00_platform.h
+++ b/include/linux/rt2x00_platform.h
@@ -14,6 +14,9 @@
struct rt2x00_platform_data {
char *eeprom_file_name;
+
+ int disable_2ghz;
+ int disable_5ghz;
};
#endif /* _RT2X00_PLATFORM_H */
--
1.8.0.1
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-12-11 10:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-11 10:04 Daniel Golle [this message]
2012-12-11 21:46 ` [PATCH 2/3] rt2x00: allow disabling bands through platform_data Gertjan van Wingerde
2012-12-12 19:24 ` Gabor Juhos
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=20121211100404.GA7817@earthship.arig \
--to=dgolle@allnet.de \
--cc=gwingerde@gmail.com \
--cc=helmut.schaa@googlemail.com \
--cc=john@phrozen.org \
--cc=juhosg@openwrt.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sgruszka@redhat.com \
--cc=users@rt2x00.serialmonkey.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.