https://bugzilla.novell.com/show_bug.cgi?id=330995#c23
--- Comment #23 from Ben Kevan 2007-10-18 23:38:49 MST ---
Ok.. i've cleaned a TON up..
Changes to the spec file:
--- ipw3945-kmp.spec.orig 2007-10-15 07:55:11.000000000 -0700
+++ ipw3945-kmp.spec 2007-10-18 21:48:01.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
Changes to skb-change file:
--- ipw3945-skb_change.diff.orig 2007-06-06 08:07:11.000000000 -0700
+++ ipw3945-skb_change.diff 2007-10-18 21:57:25.000000000 -0700
@@ -1,5 +1,5 @@
---- ipw3945.c
-+++ ipw3945.c
+--- ipw3945-1.2.2/ipw3945.c
++++ ipw3945-1.2.2/ipw3945.c
@@ -14934,7 +14934,7 @@
tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
Changes to ipw3945.diff file
--- ipw3945.diff.orig 2007-06-06 08:07:11.000000000 -0700
+++ ipw3945.diff 2007-10-18 21:51:27.000000000 -0700
@@ -1,7 +1,7 @@
-Index: ipw3945-1.2.0/Makefile
+Index: ipw3945-1.2.2/Makefile
================================================================================
---- ipw3945-1.2.1/Makefile
-+++ ipw3945-1.2.1/Makefile
+--- ipw3945-1.2.2/Makefile
++++ ipw3945-1.2.2/Makefile
@@ -26,26 +26,26 @@
# NOTE: If you have problems compiling due to IW_MODE_MONITOR not being
# defined then you need to update the wireless extension version
Changes to ipw3945-api_version.diff
--- ipw3945-api_version.diff.orig 2007-06-06 08:07:11.000000000 -0700
+++ ipw3945-api_version.diff 2007-10-18 21:53:35.000000000 -0700
@@ -1,5 +1,5 @@
---- ipw3945-1.2.1/ipw3945.c
-+++ ipw3945-1.2.1/ipw3945.c
+--- ipw3945-1.2.2/ipw3945.c
++++ ipw3945-1.2.2/ipw3945.c
@@ -67,6 +67,7 @@
#include "ipw3945.h"
Added patch5 ipw3945-dissassociate.diff
--- ipw3945-1.2.2/ipw3945.c.orig 2007-07-30 23:53:39.000000000 -0700
+++ ipw3945-1.2.2/ipw3945.c 2007-10-18 21:41:06.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);
+
------------------------------------------------------------------------------
Reasoning:
There were 4 patches, although only 3 were utilized, and created 5th patch to
fix disassociation issue. Modified existing patches to match 1.2.2 and not
1.2.1, and made all patches use the same levels of the patch command (-p1).
I realize that I mispelled dissassociation, didn't realize it until after I
built the rpm / spec's etc.. and I don't care to rebuild right now.. I'll let
the Novell person doing the work do it if they care..
I will attach src.rpm and rpm that I am currently using..
--
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.