2008-04-30 08:53:06

by Holger Schurig

Subject: [PATCH] libertas: debug output tweaks for lbs_thread

* make debug output match the variable name
* always report that lbs_remove_rtap() has has been exited

Signed-off-by: Holger Schurig <[email protected]>

Index: wireless-testing/drivers/net/wireless/libertas/main.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/libertas/main.c 2008-04-30 09:21:45.000000000 +0200
+++ wireless-testing/drivers/net/wireless/libertas/main.c 2008-04-30 09:24:05.000000000 +0200
@@ -703,7 +703,7 @@ static int lbs_thread(void *data)

if (shouldsleep) {
lbs_deb_thread("sleeping, connect_status %d, "
- "ps_mode %d, ps_state %d\n",
+ "psmode %d, psstate %d\n",
priv->connect_status,
priv->psmode, priv->psstate);
spin_unlock_irq(&priv->driver_lock);
@@ -1532,10 +1532,11 @@ static void lbs_remove_rtap(struct lbs_p
{
lbs_deb_enter(LBS_DEB_MAIN);
if (priv->rtap_net_dev == NULL)
- return;
+ goto out;
unregister_netdev(priv->rtap_net_dev);
free_netdev(priv->rtap_net_dev);
priv->rtap_net_dev = NULL;
+out:
lbs_deb_leave(LBS_DEB_MAIN);
}

2008-04-30 20:26:15

by Dan Williams

Subject: Re: [PATCH] libertas: debug output tweaks for lbs_thread

On Wed, 2008-04-30 at 10:50 +0200, Holger Schurig wrote:
> * make debug output match the variable name
> * always report that lbs_remove_rtap() has has been exited
>
> Signed-off-by: Holger Schurig <[email protected]>

Acked-by: Dan Williams <[email protected]>

> Index: wireless-testing/drivers/net/wireless/libertas/main.c
> ===================================================================
> --- wireless-testing.orig/drivers/net/wireless/libertas/main.c 2008-04-30 09:21:45.000000000 +0200
> +++ wireless-testing/drivers/net/wireless/libertas/main.c 2008-04-30 09:24:05.000000000 +0200
> @@ -703,7 +703,7 @@ static int lbs_thread(void *data)
>
> if (shouldsleep) {
> lbs_deb_thread("sleeping, connect_status %d, "
> - "ps_mode %d, ps_state %d\n",
> + "psmode %d, psstate %d\n",
> priv->connect_status,
> priv->psmode, priv->psstate);
> spin_unlock_irq(&priv->driver_lock);
> @@ -1532,10 +1532,11 @@ static void lbs_remove_rtap(struct lbs_p
> {
> lbs_deb_enter(LBS_DEB_MAIN);
> if (priv->rtap_net_dev == NULL)
> - return;
> + goto out;
> unregister_netdev(priv->rtap_net_dev);
> free_netdev(priv->rtap_net_dev);
> priv->rtap_net_dev = NULL;
> +out:
> lbs_deb_leave(LBS_DEB_MAIN);
> }
>