* [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level>
@ 2011-05-14 18:00 Hauke Mehrtens
2011-05-14 18:00 ` [PATCH 2/3] compat-wireless: set CONFIG_COMPAT_STAGING=m Hauke Mehrtens
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Hauke Mehrtens @ 2011-05-14 18:00 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
This adapt changes in commit f3a57fd148a4afd3c38f558c5b44972cb29ea8ba
"libertas: Convert lbs_pr_<level> to pr_<level>" to the compat patches.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/24-pcmcia.patch | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch
index 39f2dc0..ef058b7 100644
--- a/patches/24-pcmcia.patch
+++ b/patches/24-pcmcia.patch
@@ -834,7 +834,7 @@
.remove = __devexit_p(b43_pcmcia_remove),
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
-@@ -773,7 +773,11 @@ static void if_cs_release(struct pcmcia_
+@@ -780,7 +780,11 @@ static void if_cs_release(struct pcmcia_
lbs_deb_enter(LBS_DEB_CS);
@@ -846,7 +846,7 @@
pcmcia_disable_device(p_dev);
if (card->iobase)
ioport_unmap(card->iobase);
-@@ -781,7 +785,7 @@ static void if_cs_release(struct pcmcia_
+@@ -788,7 +792,7 @@ static void if_cs_release(struct pcmcia_
lbs_deb_leave(LBS_DEB_CS);
}
@@ -855,8 +855,8 @@
static int if_cs_ioprobe(struct pcmcia_device *p_dev, void *priv_data)
{
p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-@@ -791,9 +795,39 @@ static int if_cs_ioprobe(struct pcmcia_d
- lbs_pr_err("wrong CIS (check number of IO windows)\n");
+@@ -798,9 +802,39 @@ static int if_cs_ioprobe(struct pcmcia_d
+ pr_err("wrong CIS (check number of IO windows)\n");
return -ENODEV;
}
+#else
@@ -881,7 +881,7 @@
+
+ /* IO window settings */
+ if (cfg->io.nwin != 1) {
-+ lbs_pr_err("wrong CIS (check number of IO windows)\n");
++ pr_err("wrong CIS (check number of IO windows)\n");
+ return -ENODEV;
+ }
+#endif
@@ -895,7 +895,7 @@
}
static int if_cs_probe(struct pcmcia_device *p_dev)
-@@ -815,7 +849,16 @@ static int if_cs_probe(struct pcmcia_dev
+@@ -822,7 +856,16 @@ static int if_cs_probe(struct pcmcia_dev
card->p_dev = p_dev;
p_dev->priv = card;
@@ -911,8 +911,8 @@
+#endif
if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) {
- lbs_pr_err("error in pcmcia_loop_config\n");
-@@ -827,12 +870,26 @@ static int if_cs_probe(struct pcmcia_dev
+ pr_err("error in pcmcia_loop_config\n");
+@@ -834,12 +877,26 @@ static int if_cs_probe(struct pcmcia_dev
* a handler to the interrupt, unless the 'Handler' member of
* the irq structure is initialized.
*/
@@ -923,7 +923,7 @@
+ if (p_dev->conf.Attributes & CONF_ENABLE_IRQ) {
+ ret = pcmcia_request_irq(p_dev, &p_dev->irq);
+ if (ret) {
-+ lbs_pr_err("error in pcmcia_request_irq\n");
++ pr_err("error in pcmcia_request_irq\n");
+ goto out1;
+ }
+ }
@@ -937,9 +937,9 @@
+ card->iobase = ioport_map(p_dev->io.BasePort1, p_dev->io.NumPorts1);
+#endif
if (!card->iobase) {
- lbs_pr_err("error in ioport_map\n");
+ pr_err("error in ioport_map\n");
ret = -EIO;
-@@ -846,7 +903,17 @@ static int if_cs_probe(struct pcmcia_dev
+@@ -853,7 +910,17 @@ static int if_cs_probe(struct pcmcia_dev
}
/* Finally, report what we've done */
@@ -957,7 +957,7 @@
/*
* Most of the libertas cards can do unaligned register access, but some
-@@ -915,7 +982,11 @@ static int if_cs_probe(struct pcmcia_dev
+@@ -922,7 +989,11 @@ static int if_cs_probe(struct pcmcia_dev
priv->fw_ready = 1;
/* Now actually get the IRQ */
@@ -968,8 +968,8 @@
+#endif
IRQF_SHARED, DRV_NAME, card);
if (ret) {
- lbs_pr_err("error in request_irq\n");
-@@ -988,7 +1059,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);
+ pr_err("error in request_irq\n");
+@@ -995,7 +1066,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);
static struct pcmcia_driver lbs_driver = {
.owner = THIS_MODULE,
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] compat-wireless: set CONFIG_COMPAT_STAGING=m
2011-05-14 18:00 [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level> Hauke Mehrtens
@ 2011-05-14 18:00 ` Hauke Mehrtens
2011-05-19 21:22 ` Luis R. Rodriguez
2011-05-14 18:00 ` [PATCH 3/3] compat-wireless: fix building of brcm80211 Hauke Mehrtens
2011-05-19 21:32 ` [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level> Luis R. Rodriguez
2 siblings, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2011-05-14 18:00 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
If this is set to y and all CONFIG_BRCM* options are set to m it causes build
failures with kernel version < 2.6.36 as there is nothing build into
the kernel. Besides compat-wireless does not support build anything
into the kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/config.mk b/config.mk
index 3c034c1..abe6030 100644
--- a/config.mk
+++ b/config.mk
@@ -200,7 +200,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT will be deactivated or not working beca
endif #CONFIG_WIRELESS_EXT
ifdef CONFIG_STAGING
-CONFIG_COMPAT_STAGING=y
+CONFIG_COMPAT_STAGING=m
endif #CONFIG_STAGING
# mac80211 test driver
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] compat-wireless: fix building of brcm80211
2011-05-14 18:00 [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level> Hauke Mehrtens
2011-05-14 18:00 ` [PATCH 2/3] compat-wireless: set CONFIG_COMPAT_STAGING=m Hauke Mehrtens
@ 2011-05-14 18:00 ` Hauke Mehrtens
2011-05-19 21:22 ` Luis R. Rodriguez
2011-05-19 21:32 ` [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level> Luis R. Rodriguez
2 siblings, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2011-05-14 18:00 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
The Broadcom brcm80211 driver now needs brcmutil.ko. Furthermore the
config options are now set to m to, most parts are build as module when
the options are set to m and y. Some options for this driver where at
the wrong position in config.mk.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 15 ++++++++++-----
patches/35-fix-makefile-includes.patch | 13 +++++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/config.mk b/config.mk
index abe6030..99485a4 100644
--- a/config.mk
+++ b/config.mk
@@ -370,6 +370,10 @@ endif #CONFIG_WIRELESS_EXT
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
+ifdef CONFIG_COMPAT_STAGING
+CONFIG_BRCMSMAC=m
+endif #CONFIG_COMPAT_STAGING
+
endif #CONFIG_PCI
## end of PCI
@@ -540,10 +544,6 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_MRVL_SDIO=m
ifdef CONFIG_COMPAT_STAGING
-
-CONFIG_BRCMSMAC=y
-# CONFIG_BRCMDBG=y
-
ifdef CONFIG_WIRELESS_EXT
# CONFIG_ATH6KL_DISABLE_TARGET_DBGLOGS is not set
# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
@@ -555,7 +555,7 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
CONFIG_ATH6K_LEGACY=m
-CONFIG_BRCMFMAC=y
+CONFIG_BRCMFMAC=m
endif #CONFIG_WIRELESS_EXT
endif #CONFIG_COMPAT_STAGING
@@ -595,6 +595,11 @@ endif #CONFIG_MAC80211_LEDS
CONFIG_ATH_COMMON=m
# CONFIG_ATH_DEBUG=y
+ifdef CONFIG_COMPAT_STAGING
+CONFIG_BRCMUTIL=m
+# CONFIG_BRCMDBG=y
+endif #CONFIG_COMPAT_STAGING
+
ifdef CONFIG_CRC7
CONFIG_WL1251=m
CONFIG_WL12XX=m
diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
index 7d1ceaf..4a01aa2 100644
--- a/patches/35-fix-makefile-includes.patch
+++ b/patches/35-fix-makefile-includes.patch
@@ -46,3 +46,16 @@ path the make process will search in the kernel tree for the headers.
BRCMSMAC_OFILES := \
wl_mac80211.o \
+--- a/drivers/staging/brcm80211/util/Makefile
++++ b/drivers/staging/brcm80211/util/Makefile
+@@ -16,8 +16,8 @@
+ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ccflags-y := \
+- -Idrivers/staging/brcm80211/util \
+- -Idrivers/staging/brcm80211/include
++ -I$(obj) \
++ -I$(obj)/../include
+
+ BRCMUTIL_OFILES := \
+ bcmutils.o \
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] compat-wireless: set CONFIG_COMPAT_STAGING=m
2011-05-14 18:00 ` [PATCH 2/3] compat-wireless: set CONFIG_COMPAT_STAGING=m Hauke Mehrtens
@ 2011-05-19 21:22 ` Luis R. Rodriguez
0 siblings, 0 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2011-05-19 21:22 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Sat, May 14, 2011 at 11:00 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> If this is set to y and all CONFIG_BRCM* options are set to m it causes build
> failures with kernel version < 2.6.36 as there is nothing build into
> the kernel. Besides compat-wireless does not support build anything
> into the kernel.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
applied, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] compat-wireless: fix building of brcm80211
2011-05-14 18:00 ` [PATCH 3/3] compat-wireless: fix building of brcm80211 Hauke Mehrtens
@ 2011-05-19 21:22 ` Luis R. Rodriguez
0 siblings, 0 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2011-05-19 21:22 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Sat, May 14, 2011 at 11:00 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> The Broadcom brcm80211 driver now needs brcmutil.ko. Furthermore the
> config options are now set to m to, most parts are build as module when
> the options are set to m and y. Some options for this driver where at
> the wrong position in config.mk.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Applied, thanks!
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level>
2011-05-14 18:00 [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level> Hauke Mehrtens
2011-05-14 18:00 ` [PATCH 2/3] compat-wireless: set CONFIG_COMPAT_STAGING=m Hauke Mehrtens
2011-05-14 18:00 ` [PATCH 3/3] compat-wireless: fix building of brcm80211 Hauke Mehrtens
@ 2011-05-19 21:32 ` Luis R. Rodriguez
2 siblings, 0 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2011-05-19 21:32 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Sat, May 14, 2011 at 11:00 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> This adapt changes in commit f3a57fd148a4afd3c38f558c5b44972cb29ea8ba
> "libertas: Convert lbs_pr_<level> to pr_<level>" to the compat patches.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cherry picked some hunks as things have changed a bit, sorry for the
delay and thanks for the patch!
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-05-19 21:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-14 18:00 [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level> Hauke Mehrtens
2011-05-14 18:00 ` [PATCH 2/3] compat-wireless: set CONFIG_COMPAT_STAGING=m Hauke Mehrtens
2011-05-19 21:22 ` Luis R. Rodriguez
2011-05-14 18:00 ` [PATCH 3/3] compat-wireless: fix building of brcm80211 Hauke Mehrtens
2011-05-19 21:22 ` Luis R. Rodriguez
2011-05-19 21:32 ` [PATCH 1/3] compat-wireless: libertas lbs_pr_<level> was converted to pr_<level> Luis R. Rodriguez
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).