2008-12-09 21:46:36

by Dave Kilroy

Subject: [PATCH 1/2] orinoco: Fix function names used in debug strings

Signed-off-by: David Kilroy <[email protected]>
---
drivers/net/wireless/orinoco/orinoco_cs.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index 6fcf2bd..14ff274 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -178,13 +178,17 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
/* Note that the CIS values need to be rescaled */
if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
- DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n", vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+ DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n",
+ __func__, vcc,
+ cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
if (!ignore_cis_vcc)
goto next_entry;
}
} else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
- DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n", vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+ DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n",
+ __func__, vcc,
+ dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
if (!ignore_cis_vcc)
goto next_entry;
}
--
1.5.6.4

2008-12-09 21:58:08

by Dave Kilroy

Subject: [PATCH 2/2] orinoco: Fix inappropriate use of IRQ_BAP

This hardware buffer should only be used from an interrupt. The
wireless event generation functions are called from a workqueue, so use
USER_BAP instead.

Signed-off-by: David Kilroy <[email protected]>
---
drivers/net/wireless/orinoco/orinoco.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/orinoco/orinoco.c b/drivers/net/wireless/orinoco/orinoco.c
index 40f662e..b33e13f 100644
--- a/drivers/net/wireless/orinoco/orinoco.c
+++ b/drivers/net/wireless/orinoco/orinoco.c
@@ -1753,7 +1753,7 @@ static void orinoco_send_bssid_wevent(struct orinoco_private *priv)
union iwreq_data wrqu;
int err;

- err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENTBSSID,
+ err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID,
ETH_ALEN, NULL, wrqu.ap_addr.sa_data);
if (err != 0)
return;
@@ -1776,7 +1776,7 @@ static void orinoco_send_assocreqie_wevent(struct orinoco_private *priv)
if (!priv->has_wpa)
return;

- err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENT_ASSOC_REQ_INFO,
+ err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_ASSOC_REQ_INFO,
sizeof(buf), NULL, &buf);
if (err != 0)
return;
@@ -1806,7 +1806,7 @@ static void orinoco_send_assocrespie_wevent(struct orinoco_private *priv)
if (!priv->has_wpa)
return;

- err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENT_ASSOC_RESP_INFO,
+ err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_ASSOC_RESP_INFO,
sizeof(buf), NULL, &buf);
if (err != 0)
return;
--
1.5.6.4

2008-12-09 22:26:38

by Pavel Roskin

Subject: Re: [PATCH 1/2] orinoco: Fix function names used in debug strings

On Tue, 2008-12-09 at 21:46 +0000, David Kilroy wrote:
> Signed-off-by: David Kilroy <[email protected]>

Signed-off-by: Pavel Roskin <[email protected]>

Please consider doing the same in spectrum_cs.c, just for consistency.

--
Regards,
Pavel Roskin

2008-12-09 22:27:31

by Pavel Roskin

Subject: Re: [Orinoco-devel] [PATCH 2/2] orinoco: Fix inappropriate use of IRQ_BAP

On Tue, 2008-12-09 at 21:46 +0000, David Kilroy wrote:
> This hardware buffer should only be used from an interrupt. The
> wireless event generation functions are called from a workqueue, so use
> USER_BAP instead.
>
> Signed-off-by: David Kilroy <[email protected]>

Signed-off-by: Pavel Roskin <[email protected]>

--
Regards,
Pavel Roskin

2008-12-09 22:53:29

by Dave Kilroy

Subject: Re: [PATCH 1/2] orinoco: Fix function names used in debug strings

Pavel Roskin wrote:
> On Tue, 2008-12-09 at 21:46 +0000, David Kilroy wrote:
>> Signed-off-by: David Kilroy <[email protected]>
>
> Signed-off-by: Pavel Roskin <[email protected]>
>
> Please consider doing the same in spectrum_cs.c, just for consistency.

Coming up. Don't know why I didn't think to check it...