From: Ivo van Doorn <ivdoorn@gmail.com>
To: "Linville"@poseidon.kernel.org, "John" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH] rt2x00: fix firmware dependency
Date: Sun, 11 Mar 2007 15:03:59 +0100 [thread overview]
Message-ID: <200703111503.59778.IvDoorn@gmail.com> (raw)
There is no need to always build rt2x00lib.ko including the firmware handlers,
only rt61pci and rt73usb will require the firmware handling. So lets add a new
invisible config option selected by rt61pci and rt73usb to enable the firmware
handling inside rt2x00lib.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
diff --git a/drivers/net/wireless/mac80211/rt2x00/Kconfig b/drivers/net/wireless/mac80211/rt2x00/Kconfig
index 6242f15..0528431 100644
--- a/drivers/net/wireless/mac80211/rt2x00/Kconfig
+++ b/drivers/net/wireless/mac80211/rt2x00/Kconfig
@@ -15,6 +15,10 @@ config RT2X00_LIB
tristate
depends on RT2X00
+config RT2X00_LIB_FIRMWARE
+ boolean
+ depends on RT2X00
+
config RT2400PCI
tristate "Ralink rt2400 pci/pcmcia support"
depends on RT2X00 && PCI
@@ -39,6 +43,7 @@ config RT61PCI
tristate "Ralink rt61 pci/pcmcia support"
depends on RT2X00 && FW_LOADER && PCI
select RT2X00_LIB
+ select RT2X00_LIB_FIRMWARE
select CRC_ITU_T
select EEPROM_93CX6
---help---
@@ -59,6 +64,7 @@ config RT73USB
tristate "Ralink rt73 usb support"
depends on RT2X00 && FW_LOADER && USB
select RT2X00_LIB
+ select RT2X00_LIB_FIRMWARE
select CRC_ITU_T
---help---
This is an experimental driver for the Ralink rt73 wireless chip.
diff --git a/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c b/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c
index 8dacf00..ba27a3e 100644
--- a/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c
@@ -40,6 +40,7 @@
#include "rt2x00.h"
#include "rt2x00lib.h"
+#ifdef CONFIG_RT2X00_LIB_FIRMWARE
struct fw_entry {
u32 chip;
char *name;
@@ -92,6 +93,7 @@ int rt2x00lib_load_firmware_wait(struct rt2x00_dev *rt2x00dev)
return -ETIMEDOUT;
}
EXPORT_SYMBOL_GPL(rt2x00lib_load_firmware_wait);
+#endif /* CONFIG_RT2X00_LIB_FIRMWARE */
void rt2x00lib_update_tx_stats(struct data_entry *entry,
const int status, const int is_ack, const int retry)
diff --git a/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h b/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h
index 5ec88a6..9728d5b 100644
--- a/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h
@@ -30,9 +30,11 @@
#include <linux/firmware.h>
+#ifdef CONFIG_RT2X00_LIB_FIRMWARE
int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev, struct device *dev,
void (*cont)(const struct firmware *fw, void *context));
int rt2x00lib_load_firmware_wait(struct rt2x00_dev *rt2x00dev);
+#endif /* CONFIG_RT2X00_LIB_FIRMWARE */
void rt2x00lib_update_tx_stats(struct data_entry *entry,
const int status, const int is_ack, const int retry);
reply other threads:[~2007-03-11 14:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200703111503.59778.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=Linville@poseidon.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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.