https://bugzilla.novell.com/show_bug.cgi?id=330995#c22
--- Comment #22 from Ben Kevan 2007-10-18 17:42:51 MST ---
Here is a cleaned up output:
--- ipw3945-1.2.2/ipw3945.c 2007-07-30 23:53:39.000000000 -0700
+++ ipw3945-1.2.2/ipw3945.c 2007-10-18 16:30:12.000000000 -0700
@@ -12223,11 +12223,18 @@
if (length == 0) {
IPW_DEBUG_WX("Setting ESSID to ANY\n");
priv->config &= ~CFG_STATIC_ESSID;
- priv->config |= CFG_ASSOCIATE;
- if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)))
{
+ if((priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING))
+ && !(priv->config & CFG_ASSOCIATE)) {
+ IPW_DEBUG_ASSOC
+ ("Deassociating because OFF/ANY set with auto
association"
+ " disabled.\n");
+ ipw_disassociate(priv);
+ }
+ if ((priv->config & CFG_ASSOCIATE) &&
+ !(priv->status & (STATUS_ASSOCIATED |
STATUS_ASSOCIATING))) {
IPW_DEBUG_ASSOC
("Attempting to associate with new "
- "parameters.\n");
+ "parameters because auto association is
enabled.\n");
ipw_associate(priv);
}
mutex_unlock(&priv->mutex);
@@ -12239,6 +12246,7 @@
if (priv->essid_len == length && !memcmp(priv->essid, extra, length)
&& (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING))) {
IPW_DEBUG_WX("ESSID set to current ESSID.\n");
+ queue_work(priv->workqueue, &priv->link_up);
mutex_unlock(&priv->mutex);
return 0;
}
@@ -12249,8 +12257,8 @@
memcpy(priv->essid, essid, priv->essid_len);
/* Network configuration changed -- force [re]association */
IPW_DEBUG_ASSOC("[re]association triggered due to ESSID change.\n");
- if (!ipw_disassociate(priv))
- ipw_associate(priv);
+ ipw_disassociate(priv);
+ ipw_associate(priv);
mutex_unlock(&priv->mutex);
return 0;
@@ -16963,3 +16971,4 @@
#endif
module_exit(ipw_exit);
module_init(ipw_init);
+
I have also modified the spec file, since for some reason it didn't include
patch 4 .. also, on my system.. (doesn't have to really be done) I modified
patch 3 to follow patch -p1 and not just patch (keep standard with the other
patches)
--- ipw3945-kmp.spec.orig 2007-10-15 07:55:11.000000000 -0700
+++ ipw3945-kmp.spec 2007-10-18 16:38:59.000000000 -0700
@@ -26,6 +26,7 @@
Patch2: ipw3945-api_version.diff
Patch3: ipw3945-skb_change.diff
Patch4: ipw3945-oops.diff
+Patch5: ipw3945-dissassociate.diff
Source100: preamble
ExclusiveArch: %ix86 x86_64 ppc ppc64
%suse_kernel_module_package -n ipw3945 -p %_sourcedir/preamble kdump um
@@ -59,7 +60,9 @@
%setup -n ipw3945-%{version}
%patch1 -p1
%patch2 -p1
-%patch3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
for flavor in %flavors_to_build; do
I haven't built into rpm yet (time constraints) but I will and test.
--
Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.