rpms/kernel/FC-4 linux-2.6-ipw2200-hwcrypto.patch, NONE, 1.1 kernel-2.6.spec, 1.1599, 1.1600

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23507

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ipw2200-hwcrypto.patch 
Log Message:
set ipw2200 hwcrypto option off by default

linux-2.6-ipw2200-hwcrypto.patch:
 ipw2200.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ipw2200-hwcrypto.patch ---
--- linux-2.6.15/drivers/net/wireless/ipw2200.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15/drivers/net/wireless/ipw2200.c	2006-02-15 14:15:59.000000000 -0500
@@ -55,7 +55,7 @@ static int associate = 1;
 static int auto_create = 1;
 static int led = 0;
 static int disable = 0;
-static int hwcrypto = 1;
+static int hwcrypto = 0;
 static const char ipw_modes[] = {
 	'a', 'b', 'g', '?'
 };
@@ -7059,8 +7059,7 @@ static int ipw_associate_network(struct 
 		priv->assoc_request.auth_key = priv->ieee->sec.active_key;
 
 		if ((priv->capability & CAP_PRIVACY_ON) &&
-		    (priv->ieee->sec.level == SEC_LEVEL_1) &&
-		    !(priv->ieee->host_encrypt || priv->ieee->host_decrypt))
+		    (priv->ieee->sec.level == SEC_LEVEL_1))
 			ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP);
 	} else {
 		priv->assoc_request.auth_type = AUTH_OPEN;
@@ -11287,7 +11286,7 @@ MODULE_PARM_DESC(mode, "network mode (0=
 #endif
 
 module_param(hwcrypto, int, 0444);
-MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default on)");
+MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default off)");
 
 module_param(cmdlog, int, 0444);
 MODULE_PARM_DESC(cmdlog,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1599
retrieving revision 1.1600
diff -u -r1.1599 -r1.1600
--- kernel-2.6.spec	10 Feb 2006 08:26:29 -0000	1.1599
+++ kernel-2.6.spec	16 Feb 2006 18:39:57 -0000	1.1600
@@ -312,6 +312,7 @@
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
+Patch1302: linux-2.6-ipw2200-hwcrypto.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -721,6 +722,8 @@
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
+# ipw2200 hwcrypto=0 by default to avoid firmware restarts
+%patch1302 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -1272,6 +1275,9 @@
 %endif
 
 %changelog
+* Fri Feb 16 2006 John W. Linville <linville at redhat.com>
+- Set ipw2200 hwcrypto option to 0 to avoid firmware restarts.
+
 * Fri Feb 10 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1832_FC4]
 - 2.6.15.4