[PATCH] move wlan_*_association_work from header to c file

[PATCH] move wlan_*_association_work from header to c file

[Holger Schurig]

Move wlan_postpone_association_work() and wlan_cancel_association_work()
from a assoc.h file to the sole user, into wext.c.

In passing, rename the functions to libertas_XXX.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>

Index: wireless-2.6/drivers/net/wireless/libertas/assoc.h
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/libertas/assoc.h	2007-10-11 12:14:50.000000000 +0200
+++ wireless-2.6/drivers/net/wireless/libertas/assoc.h	2007-10-11 12:44:12.000000000 +0200
@@ -11,22 +11,4 @@ struct assoc_request * wlan_get_associat
 
 void libertas_sync_channel(struct work_struct *work);
 
-#define ASSOC_DELAY (HZ / 2)
-static inline void wlan_postpone_association_work(wlan_private *priv)
-{
-	if (priv->adapter->surpriseremoved)
-		return;
-	cancel_delayed_work(&priv->assoc_work);
-	queue_delayed_work(priv->work_thread, &priv->assoc_work, ASSOC_DELAY);
-}
-
-static inline void wlan_cancel_association_work(wlan_private *priv)
-{
-	cancel_delayed_work(&priv->assoc_work);
-	if (priv->adapter->pending_assoc_req) {
-		kfree(priv->adapter->pending_assoc_req);
-		priv->adapter->pending_assoc_req = NULL;
-	}
-}
-
 #endif /* _WLAN_ASSOC_H */
Index: wireless-2.6/drivers/net/wireless/libertas/wext.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/libertas/wext.c	2007-10-11 12:14:50.000000000 +0200
+++ wireless-2.6/drivers/net/wireless/libertas/wext.c	2007-10-11 12:50:29.000000000 +0200
@@ -21,6 +21,24 @@
 #include "assoc.h"
 
 
+static inline void libertas_postpone_association_work(wlan_private *priv)
+{
+	if (priv->adapter->surpriseremoved)
+		return;
+	cancel_delayed_work(&priv->assoc_work);
+	queue_delayed_work(priv->work_thread, &priv->assoc_work, HZ / 2);
+}
+
+static inline void libertas_cancel_association_work(wlan_private *priv)
+{
+	cancel_delayed_work(&priv->assoc_work);
+	if (priv->adapter->pending_assoc_req) {
+		kfree(priv->adapter->pending_assoc_req);
+		priv->adapter->pending_assoc_req = NULL;
+	}
+}
+
+
 /**
  *  @brief Find the channel frequency power info with specific channel
  *
@@ -949,9 +967,9 @@ static int wlan_set_freq(struct net_devi
 out:
 	if (ret == 0) {
 		set_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags);
-		wlan_postpone_association_work(priv);
+		libertas_postpone_association_work(priv);
 	} else {
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 	}
 	mutex_unlock(&adapter->lock);
 
@@ -1050,11 +1068,11 @@ static int wlan_set_mode(struct net_devi
 	assoc_req = wlan_get_association_request(adapter);
 	if (!assoc_req) {
 		ret = -ENOMEM;
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 	} else {
 		assoc_req->mode = *uwrq;
 		set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
-		wlan_postpone_association_work(priv);
+		libertas_postpone_association_work(priv);
 		lbs_deb_wext("Switching to mode: 0x%x\n", *uwrq);
 	}
 	mutex_unlock(&adapter->lock);
@@ -1335,9 +1353,9 @@ static int wlan_set_encode(struct net_de
 out:
 	if (ret == 0) {
 		set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-		wlan_postpone_association_work(priv);
+		libertas_postpone_association_work(priv);
 	} else {
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 	}
 	mutex_unlock(&adapter->lock);
 
@@ -1576,9 +1594,9 @@ static int wlan_set_encodeext(struct net
 
 out:
 	if (ret == 0) {
-		wlan_postpone_association_work(priv);
+		libertas_postpone_association_work(priv);
 	} else {
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 	}
 	mutex_unlock(&adapter->lock);
 
@@ -1623,9 +1641,9 @@ static int wlan_set_genie(struct net_dev
 out:
 	if (ret == 0) {
 		set_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags);
-		wlan_postpone_association_work(priv);
+		libertas_postpone_association_work(priv);
 	} else {
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 	}
 	mutex_unlock(&adapter->lock);
 
@@ -1752,9 +1770,9 @@ out:
 	if (ret == 0) {
 		if (updated)
 			set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
-		wlan_postpone_association_work(priv);
+		libertas_postpone_association_work(priv);
 	} else if (ret != -EOPNOTSUPP) {
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 	}
 	mutex_unlock(&adapter->lock);
 
@@ -1929,13 +1947,13 @@ out:
 			memcpy(&assoc_req->ssid, &ssid, IW_ESSID_MAX_SIZE);
 			assoc_req->ssid_len = ssid_len;
 			set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
-			wlan_postpone_association_work(priv);
+			libertas_postpone_association_work(priv);
 		}
 	}
 
 	/* Cancel the association request if there was an error */
 	if (ret != 0) {
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 	}
 
 	mutex_unlock(&adapter->lock);
@@ -1973,13 +1991,13 @@ static int wlan_set_wap(struct net_devic
 	/* Get or create the current association request */
 	assoc_req = wlan_get_association_request(adapter);
 	if (!assoc_req) {
-		wlan_cancel_association_work(priv);
+		libertas_cancel_association_work(priv);
 		ret = -ENOMEM;
 	} else {
 		/* Copy the BSSID to the association request */
 		memcpy(&assoc_req->bssid, awrq->sa_data, ETH_ALEN);
 		set_bit(ASSOC_FLAG_BSSID, &assoc_req->flags);
-		wlan_postpone_association_work(priv);
+		libertas_postpone_association_work(priv);
 	}
 
 	mutex_unlock(&adapter->lock);

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Thu, 2007-10-11 at 11:51 +0200, Holger Schurig wrote:
> Move wlan_postpone_association_work() and wlan_cancel_association_work()
> from a assoc.h file to the sole user, into wext.c.
> 
> In passing, rename the functions to libertas_XXX.
> 
> Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>

Acked-by: Dan Williams <dcbw@redhat.com>

> 
> Index: wireless-2.6/drivers/net/wireless/libertas/assoc.h
> ===================================================================
> --- wireless-2.6.orig/drivers/net/wireless/libertas/assoc.h	2007-10-11 12:14:50.000000000 +0200
> +++ wireless-2.6/drivers/net/wireless/libertas/assoc.h	2007-10-11 12:44:12.000000000 +0200
> @@ -11,22 +11,4 @@ struct assoc_request * wlan_get_associat
>  
>  void libertas_sync_channel(struct work_struct *work);
>  
> -#define ASSOC_DELAY (HZ / 2)
> -static inline void wlan_postpone_association_work(wlan_private *priv)
> -{
> -	if (priv->adapter->surpriseremoved)
> -		return;
> -	cancel_delayed_work(&priv->assoc_work);
> -	queue_delayed_work(priv->work_thread, &priv->assoc_work, ASSOC_DELAY);
> -}
> -
> -static inline void wlan_cancel_association_work(wlan_private *priv)
> -{
> -	cancel_delayed_work(&priv->assoc_work);
> -	if (priv->adapter->pending_assoc_req) {
> -		kfree(priv->adapter->pending_assoc_req);
> -		priv->adapter->pending_assoc_req = NULL;
> -	}
> -}
> -
>  #endif /* _WLAN_ASSOC_H */
> Index: wireless-2.6/drivers/net/wireless/libertas/wext.c
> ===================================================================
> --- wireless-2.6.orig/drivers/net/wireless/libertas/wext.c	2007-10-11 12:14:50.000000000 +0200
> +++ wireless-2.6/drivers/net/wireless/libertas/wext.c	2007-10-11 12:50:29.000000000 +0200
> @@ -21,6 +21,24 @@
>  #include "assoc.h"
>  
> 
> +static inline void libertas_postpone_association_work(wlan_private *priv)
> +{
> +	if (priv->adapter->surpriseremoved)
> +		return;
> +	cancel_delayed_work(&priv->assoc_work);
> +	queue_delayed_work(priv->work_thread, &priv->assoc_work, HZ / 2);
> +}
> +
> +static inline void libertas_cancel_association_work(wlan_private *priv)
> +{
> +	cancel_delayed_work(&priv->assoc_work);
> +	if (priv->adapter->pending_assoc_req) {
> +		kfree(priv->adapter->pending_assoc_req);
> +		priv->adapter->pending_assoc_req = NULL;
> +	}
> +}
> +
> +
>  /**
>   *  @brief Find the channel frequency power info with specific channel
>   *
> @@ -949,9 +967,9 @@ static int wlan_set_freq(struct net_devi
>  out:
>  	if (ret == 0) {
>  		set_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1050,11 +1068,11 @@ static int wlan_set_mode(struct net_devi
>  	assoc_req = wlan_get_association_request(adapter);
>  	if (!assoc_req) {
>  		ret = -ENOMEM;
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	} else {
>  		assoc_req->mode = *uwrq;
>  		set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  		lbs_deb_wext("Switching to mode: 0x%x\n", *uwrq);
>  	}
>  	mutex_unlock(&adapter->lock);
> @@ -1335,9 +1353,9 @@ static int wlan_set_encode(struct net_de
>  out:
>  	if (ret == 0) {
>  		set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1576,9 +1594,9 @@ static int wlan_set_encodeext(struct net
>  
>  out:
>  	if (ret == 0) {
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1623,9 +1641,9 @@ static int wlan_set_genie(struct net_dev
>  out:
>  	if (ret == 0) {
>  		set_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1752,9 +1770,9 @@ out:
>  	if (ret == 0) {
>  		if (updated)
>  			set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else if (ret != -EOPNOTSUPP) {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1929,13 +1947,13 @@ out:
>  			memcpy(&assoc_req->ssid, &ssid, IW_ESSID_MAX_SIZE);
>  			assoc_req->ssid_len = ssid_len;
>  			set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
> -			wlan_postpone_association_work(priv);
> +			libertas_postpone_association_work(priv);
>  		}
>  	}
>  
>  	/* Cancel the association request if there was an error */
>  	if (ret != 0) {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  
>  	mutex_unlock(&adapter->lock);
> @@ -1973,13 +1991,13 @@ static int wlan_set_wap(struct net_devic
>  	/* Get or create the current association request */
>  	assoc_req = wlan_get_association_request(adapter);
>  	if (!assoc_req) {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  		ret = -ENOMEM;
>  	} else {
>  		/* Copy the BSSID to the association request */
>  		memcpy(&assoc_req->bssid, awrq->sa_data, ETH_ALEN);
>  		set_bit(ASSOC_FLAG_BSSID, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	}
>  
>  	mutex_unlock(&adapter->lock);

Re: [PATCH] move wlan_*_association_work from header to c file

[John W. Linville]

Please put "libertas: " at the beginning of your Subject lines...

No need to repost, I've got this one.

John

On Thu, Oct 11, 2007 at 11:51:06AM +0200, Holger Schurig wrote:
> Move wlan_postpone_association_work() and wlan_cancel_association_work()
> from a assoc.h file to the sole user, into wext.c.
> 
> In passing, rename the functions to libertas_XXX.
> 
> Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH] move wlan_*_association_work from header to c file

[Christoph Hellwig]

On Thu, Oct 11, 2007 at 11:51:06AM +0200, Holger Schurig wrote:
> Move wlan_postpone_association_work() and wlan_cancel_association_work()
> from a assoc.h file to the sole user, into wext.c.
> 
> In passing, rename the functions to libertas_XXX.

As you seem to do some nice cleanups on libertas is there a chance
you could get rid of this horrible wlan_ namespace abuse in the driver?

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Thu, 2007-10-11 at 15:16 +0100, Christoph Hellwig wrote:
> On Thu, Oct 11, 2007 at 11:51:06AM +0200, Holger Schurig wrote:
> > Move wlan_postpone_association_work() and wlan_cancel_association_work()
> > from a assoc.h file to the sole user, into wext.c.
> > 
> > In passing, rename the functions to libertas_XXX.
> 
> As you seem to do some nice cleanups on libertas is there a chance
> you could get rid of this horrible wlan_ namespace abuse in the driver?

100% agree...  That's always been part of the plan, just that other
cleanups were more pressing and time always runs out.

IMHO 'libertas' is too long as a prefix for stuff, and replacing wlan_
with libertas_ is going to screw up spacing everywhere.  So, any
objections to, as part of the longer-term plan, replace the usage of
'libertas_' and 'wlan_' with the prefix "lts"?  Would look like:

wlan_set_essid -> lts_set_essid
wlan_private -> lts_private
etc

(I don't really like 'lbs' personally but I'm not that strongly against
it)

Dan

Re: [PATCH] move wlan_*_association_work from header to c file

[Holger Schurig]

> wlan_set_essid -> lts_set_essid
> wlan_private -> lts_private
>
> (I don't really like 'lbs' personally but I'm not that
> strongly against it)

I've used lbs_XXX and LBS_DEB_xxx for the debugging stuff. Do you 
want to get that changed to lts_XXX and LTS_DEB_xxx, too?

(I personally like lbs more, but am also not strongly for it or 
against something else, I just want to keep things orthogonal)

[PATCH] libertas: move to uniform lbs_/LBS_ namespace

[Holger Schurig]

Uups, sorry.

I didn't change the subject of my previous mail in this thread. 
Because the patch is rather big, I won't re-sent it. I hope this 
notification mail is all that is needed.

Re: [PATCH] libertas: move to uniform lbs_/LBS_ namespace

[Holger Schurig]

Hmm, the patch I was referring to hangs in the moderation queue.

It's 302 kB, while the mailing list only allows 40 kB.

Even with bzip2 the patch is still 44 kB.  What is the 
recommended procedure?

Re: [PATCH] libertas: move to uniform lbs_/LBS_ namespace

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

On Mon, 2007-10-15 at 13:07 +0200, Holger Schurig wrote:
> Hmm, the patch I was referring to hangs in the moderation queue.

Actually, there's no moderation, it's just dropped, at least on
linux-wireless.

> It's 302 kB, while the mailing list only allows 40 kB.
> 
> Even with bzip2 the patch is still 44 kB.  What is the 
> recommended procedure?

Send a link I guess.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] libertas: move to uniform lbs_/LBS_ namespace

[Holger Schurig]

> Send a link I guess.

Okay, have done this. Please keep in mind that my git-fu is quite 
undeveloped (especially the branching thingy).

However, I created on git.infradead.org a git with linux-2.6 as 
reference. Into this I pulled wireless-2.6. Then I checked this 
out on my local computer, switched to branch everything and 
applied my current 4 patches that aren't yet in wireless-2.6. 
This again I pushed.

I hope I did everything right :-)

http://git.infradead.org/?p=users/schurig/libertas-cleanup.git;a=shortlog;h=cleanup

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Mon, 2007-10-15 at 09:18 +0200, Holger Schurig wrote:
> > wlan_set_essid -> lts_set_essid
> > wlan_private -> lts_private
> >
> > (I don't really like 'lbs' personally but I'm not that
> > strongly against it)
> 
> I've used lbs_XXX and LBS_DEB_xxx for the debugging stuff. Do you 
> want to get that changed to lts_XXX and LTS_DEB_xxx, too?
> 
> (I personally like lbs more, but am also not strongly for it or 
> against something else, I just want to keep things orthogonal)

I don't really care.  You've already done the work for 'lbs' so that's
fine by me.

Dan

Re: [PATCH] move wlan_*_association_work from header to c file

[Holger Schurig]

Hi Dan !

> I don't really care.  You've already done the work for 'lbs'
> so that's fine by me.

Yeah, but doing something like

   perl -pi -e 's:lbs_:lts_:g' XXXX.patch

would be easy enought.



Did already look at

http://git.infradead.org/?p=users/schurig/libertas-cleanup.git;a=commitdiff;h=aff223229493c7c43c8acedc728cdb312f82f3f9

????   Please review :-)

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Mon, 2007-10-15 at 16:28 +0200, Holger Schurig wrote:
> Hi Dan !
> 
> > I don't really care.  You've already done the work for 'lbs'
> > so that's fine by me.
> 
> Yeah, but doing something like
> 
>    perl -pi -e 's:lbs_:lts_:g' XXXX.patch
> 
> would be easy enought.
> 
> 
> 
> Did already look at
> 
> http://git.infradead.org/?p=users/schurig/libertas-cleanup.git;a=commitdiff;h=aff223229493c7c43c8acedc728cdb312f82f3f9
> 
> ????   Please review :-)

Yeah, I got through maybe 1/3 of it so far, it's huge :)  I don't have
one of my libertas parts to test with me right now, but I'll try to do
that today or tomorrow.  I'd like to just run through a few scenarios to
make sure.  I assume you've been running it for a few days or so?

Dan

Re: [PATCH] move wlan_*_association_work from header to c file

[Holger Schurig]

> I assume you've been running it for a few days or so?

No. I just made this patch 6 hours ago.

I've used it so far only with WEP and no encryption at all, 
always as STA (no ad-hoc, no wpa-supplicant).

After all, the patch was created using "perl -pi -e" :-)


So far I found two quirks:

a) it's no longer /lib/modules/libertas/parameters/libertas_debug 
but /lib/modules/libertas/parameters/lbs_debug. As this is an 
ABI change, we might not want it.

b) it's no longer <debugfs>/libertas_wireless/XXXX but 
<debugfs>/lbs_wireless/XXXX. Also an ABI change.


I could make a "take 2" patch, but because of the size of the 
patch and the hassle to export it in an external git tree I'd 
rather create a fixup patch. But let's see what you un-earth.

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Mon, 2007-10-15 at 16:49 +0200, Holger Schurig wrote:
> > I assume you've been running it for a few days or so?
> 
> No. I just made this patch 6 hours ago.
> 
> I've used it so far only with WEP and no encryption at all, 
> always as STA (no ad-hoc, no wpa-supplicant).
> 
> After all, the patch was created using "perl -pi -e" :-)
> 
> 
> So far I found two quirks:
> 
> a) it's no longer /lib/modules/libertas/parameters/libertas_debug 
> but /lib/modules/libertas/parameters/lbs_debug. As this is an 
> ABI change, we might not want it.

Should keep ABI compat here.

> b) it's no longer <debugfs>/libertas_wireless/XXXX but 
> <debugfs>/lbs_wireless/XXXX. Also an ABI change.

Should keep ABI compat here.

> 
> I could make a "take 2" patch, but because of the size of the 
> patch and the hassle to export it in an external git tree I'd 
> rather create a fixup patch. But let's see what you un-earth.

Yeah, I'll keep looking through it.

Dan

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Thu, 2007-10-11 at 11:51 +0200, Holger Schurig wrote:
> Move wlan_postpone_association_work() and wlan_cancel_association_work()
> from a assoc.h file to the sole user, into wext.c.
> 
> In passing, rename the functions to libertas_XXX.
> 
> Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>

Acked-by: Dan Williams <dcbw@redhat.com>

> 
> Index: wireless-2.6/drivers/net/wireless/libertas/assoc.h
> ===================================================================
> --- wireless-2.6.orig/drivers/net/wireless/libertas/assoc.h	2007-10-11 12:14:50.000000000 +0200
> +++ wireless-2.6/drivers/net/wireless/libertas/assoc.h	2007-10-11 12:44:12.000000000 +0200
> @@ -11,22 +11,4 @@ struct assoc_request * wlan_get_associat
>  
>  void libertas_sync_channel(struct work_struct *work);
>  
> -#define ASSOC_DELAY (HZ / 2)
> -static inline void wlan_postpone_association_work(wlan_private *priv)
> -{
> -	if (priv->adapter->surpriseremoved)
> -		return;
> -	cancel_delayed_work(&priv->assoc_work);
> -	queue_delayed_work(priv->work_thread, &priv->assoc_work, ASSOC_DELAY);
> -}
> -
> -static inline void wlan_cancel_association_work(wlan_private *priv)
> -{
> -	cancel_delayed_work(&priv->assoc_work);
> -	if (priv->adapter->pending_assoc_req) {
> -		kfree(priv->adapter->pending_assoc_req);
> -		priv->adapter->pending_assoc_req = NULL;
> -	}
> -}
> -
>  #endif /* _WLAN_ASSOC_H */
> Index: wireless-2.6/drivers/net/wireless/libertas/wext.c
> ===================================================================
> --- wireless-2.6.orig/drivers/net/wireless/libertas/wext.c	2007-10-11 12:14:50.000000000 +0200
> +++ wireless-2.6/drivers/net/wireless/libertas/wext.c	2007-10-11 12:50:29.000000000 +0200
> @@ -21,6 +21,24 @@
>  #include "assoc.h"
>  
> 
> +static inline void libertas_postpone_association_work(wlan_private *priv)
> +{
> +	if (priv->adapter->surpriseremoved)
> +		return;
> +	cancel_delayed_work(&priv->assoc_work);
> +	queue_delayed_work(priv->work_thread, &priv->assoc_work, HZ / 2);
> +}
> +
> +static inline void libertas_cancel_association_work(wlan_private *priv)
> +{
> +	cancel_delayed_work(&priv->assoc_work);
> +	if (priv->adapter->pending_assoc_req) {
> +		kfree(priv->adapter->pending_assoc_req);
> +		priv->adapter->pending_assoc_req = NULL;
> +	}
> +}
> +
> +
>  /**
>   *  @brief Find the channel frequency power info with specific channel
>   *
> @@ -949,9 +967,9 @@ static int wlan_set_freq(struct net_devi
>  out:
>  	if (ret == 0) {
>  		set_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1050,11 +1068,11 @@ static int wlan_set_mode(struct net_devi
>  	assoc_req = wlan_get_association_request(adapter);
>  	if (!assoc_req) {
>  		ret = -ENOMEM;
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	} else {
>  		assoc_req->mode = *uwrq;
>  		set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  		lbs_deb_wext("Switching to mode: 0x%x\n", *uwrq);
>  	}
>  	mutex_unlock(&adapter->lock);
> @@ -1335,9 +1353,9 @@ static int wlan_set_encode(struct net_de
>  out:
>  	if (ret == 0) {
>  		set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1576,9 +1594,9 @@ static int wlan_set_encodeext(struct net
>  
>  out:
>  	if (ret == 0) {
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1623,9 +1641,9 @@ static int wlan_set_genie(struct net_dev
>  out:
>  	if (ret == 0) {
>  		set_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1752,9 +1770,9 @@ out:
>  	if (ret == 0) {
>  		if (updated)
>  			set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	} else if (ret != -EOPNOTSUPP) {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  	mutex_unlock(&adapter->lock);
>  
> @@ -1929,13 +1947,13 @@ out:
>  			memcpy(&assoc_req->ssid, &ssid, IW_ESSID_MAX_SIZE);
>  			assoc_req->ssid_len = ssid_len;
>  			set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
> -			wlan_postpone_association_work(priv);
> +			libertas_postpone_association_work(priv);
>  		}
>  	}
>  
>  	/* Cancel the association request if there was an error */
>  	if (ret != 0) {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  	}
>  
>  	mutex_unlock(&adapter->lock);
> @@ -1973,13 +1991,13 @@ static int wlan_set_wap(struct net_devic
>  	/* Get or create the current association request */
>  	assoc_req = wlan_get_association_request(adapter);
>  	if (!assoc_req) {
> -		wlan_cancel_association_work(priv);
> +		libertas_cancel_association_work(priv);
>  		ret = -ENOMEM;
>  	} else {
>  		/* Copy the BSSID to the association request */
>  		memcpy(&assoc_req->bssid, awrq->sa_data, ETH_ALEN);
>  		set_bit(ASSOC_FLAG_BSSID, &assoc_req->flags);
> -		wlan_postpone_association_work(priv);
> +		libertas_postpone_association_work(priv);
>  	}
>  
>  	mutex_unlock(&adapter->lock);

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Mon, 2007-10-15 at 12:43 -0400, Dan Williams wrote:
> On Mon, 2007-10-15 at 16:49 +0200, Holger Schurig wrote:
> > > I assume you've been running it for a few days or so?
> > 
> > No. I just made this patch 6 hours ago.
> > 
> > I've used it so far only with WEP and no encryption at all, 
> > always as STA (no ad-hoc, no wpa-supplicant).
> > 
> > After all, the patch was created using "perl -pi -e" :-)
> > 
> > 
> > So far I found two quirks:
> > 
> > a) it's no longer /lib/modules/libertas/parameters/libertas_debug 
> > but /lib/modules/libertas/parameters/lbs_debug. As this is an 
> > ABI change, we might not want it.
> 
> Should keep ABI compat here.
> 
> > b) it's no longer <debugfs>/libertas_wireless/XXXX but 
> > <debugfs>/lbs_wireless/XXXX. Also an ABI change.
> 
> Should keep ABI compat here.
> 
> > 
> > I could make a "take 2" patch, but because of the size of the 
> > patch and the hassle to export it in an external git tree I'd 
> > rather create a fixup patch. But let's see what you un-earth.
> 
> Yeah, I'll keep looking through it.

So, I think the debugfs thing is fine to keep in sync with the driver
prefix.  But for now, lets keep the module name the same.  Can you
repost (with a link since it's so huge)?

I ran the driver for a while and nothing appears to have regressed
horribly from light testing a few large transfers.  Seems OK to push
into 2.6.25 to me.

Dan

Re: [PATCH] move wlan_*_association_work from header to c file

[Holger Schurig]

Hi John,

I've put both patches that Dan acknowledged with

> I ran the driver for a while and nothing appears to have
> regressed horribly from light testing a few large transfers. 
> Seems OK to push into 2.6.25 to me.

and

> > In passing, rename the functions to libertas_XXX.
> > 
> > Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
>
> Acked-by: Dan Williams <dcbw@redhat.com>

onto

  http://git.infradead.org/?p=users/schurig/libertas-cleanup.git;a=summary

or

  git://git.infradead.org/users/schurig/libertas-cleanup.git


(The rename patch is so huge). Please apply.

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Thu, 2007-10-25 at 10:37 +0200, Holger Schurig wrote:
> Hi John,
> 
> I've put both patches that Dan acknowledged with
> 
> > I ran the driver for a while and nothing appears to have
> > regressed horribly from light testing a few large transfers. 
> > Seems OK to push into 2.6.25 to me.
> 
> and
> 
> > > In passing, rename the functions to libertas_XXX.
> > > 
> > > Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
> >
> > Acked-by: Dan Williams <dcbw@redhat.com>
> 
> onto
> 
>   http://git.infradead.org/?p=users/schurig/libertas-cleanup.git;a=summary
> 
> or
> 
>   git://git.infradead.org/users/schurig/libertas-cleanup.git
> 
> 
> (The rename patch is so huge). Please apply.

Acked-by: Dan Williams <dcbw@redhat.com>

Thanks for fixing the two ABI things.  John, can you pull into whatever
you're targetting for 2.6.25?

Thanks,
Dan

Re: [PATCH] move wlan_*_association_work from header to c file

[Holger Schurig]

Hi John !

wireless-2.6/everything is a moving target. The two patches I've 
sent yesterday no longer apply cleanly. So I've made them new.

Because of the sheer size of one of them, I've put them there:

http://git.infradead.org/?p=users/schurig/libertas-cleanup.git;a=shortlog;h=cleanup


Please apply.

Re: [PATCH] move wlan_*_association_work from header to c file

[John W. Linville]

On Fri, Oct 26, 2007 at 01:43:51PM +0200, Holger Schurig wrote:
> Hi John !
> 
> wireless-2.6/everything is a moving target. The two patches I've 
> sent yesterday no longer apply cleanly. So I've made them new.
> 
> Because of the sheer size of one of them, I've put them there:
> 
> http://git.infradead.org/?p=users/schurig/libertas-cleanup.git;a=shortlog;h=cleanup
> 
> 
> Please apply.

The 2nd patch "libertas: move to uniform lbs_/LBS_ namespace" breaks
the compile of if_sdio.c, so I had to drop it.  I dropped "libertas:
clean up association debug messages" as well.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH] move wlan_*_association_work from header to c file

[Holger Schurig]

> The 2nd patch "libertas: move to uniform lbs_/LBS_ namespace"
> breaks the compile of if_sdio.c, so I had to drop it.  I
> dropped "libertas: clean up association debug messages" as
> well.

I didn't see an if_sdio.c in my tree when I made the patch.

And I wont make a third patch. It's quite discouraging to send 
things which don't get applied (for no known reasons) for more 
than a week. And during that time they bitrot. Would the patch 
have been applied timely, it would have worked in the first 
place.

Also, changing all things wlan_XXX in libertas_XXX is soooo easy. 
However, I won't do it. The one who originally asked for the 
cleanup patch should do the work and have the patience to get 
the patch through, I have real work to do.

Re: [PATCH] move wlan_*_association_work from header to c file

[Dan Williams]

On Tue, 2007-11-06 at 13:51 +0100, Holger Schurig wrote:
> > The 2nd patch "libertas: move to uniform lbs_/LBS_ namespace"
> > breaks the compile of if_sdio.c, so I had to drop it.  I
> > dropped "libertas: clean up association debug messages" as
> > well.
> 
> I didn't see an if_sdio.c in my tree when I made the patch.
> 
> And I wont make a third patch. It's quite discouraging to send 
> things which don't get applied (for no known reasons) for more 
> than a week. And during that time they bitrot. Would the patch 
> have been applied timely, it would have worked in the first 
> place.

This is the way things work.  The patch clearly was not material for
2.6.24 given the timing.  Therefore, it's 2.6.25.  Therefore, since
if_sdio.c was ready to go in _August_, it hit 2.6.24, but you didn't
have it because your patch was based on 2.6.23, not 2.6.24-rc1.  That's
distributed development.  If you want a feature, you have to keep coming
back until it gets where you need to go, if you want the benefits of
distributed development.

> Also, changing all things wlan_XXX in libertas_XXX is soooo easy. 
> However, I won't do it. The one who originally asked for the 
> cleanup patch should do the work and have the patience to get 
> the patch through, I have real work to do.

In any case, thanks for the work.  I'll see if I can pick it up.

Dan