Skip to contentSkip to conversation

libertas: debug output tweaks for lbs_thread

PATCH In review Holger Schurig 2 participants 2 messages Apr 30, 2008 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libertas: debug output tweaks for lbs_thread

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

drivers/net/wireless/libertas/main.c +3 -2
Index: wireless-testing/drivers/net/wireless/libertas/main.c
===================================================================
@@ -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);
 }
 
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Holger Schurig

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

Quoted 26 lines

Index: wireless-testing/drivers/net/wireless/libertas/main.c
===================================================================

drivers/net/wireless/libertas/main.c +3 -2
@@ -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);
 }