[PATCH 6/14 linux-2.6.7-rc1] prism54: Fix prism54.org bugs 74, 75

[Luis R. Rodriguez]

2004-03-22      Aurelien Alleaume <slts@xxxxxxx>

        * oid_mgt.c, isl_ioctl.c : Minor bugfixes : #74 and #75.

-- 
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E
2004-03-22	Aurelien Alleaume <slts@xxxxxxx>

	* oid_mgt.c, isl_ioctl.c : Minor bugfixes : #74 and #75.

Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/isl_ioctl.c
===================================================================
RCS file: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- linux-2.6.7-rc1/drivers/net/wireless/prism54/isl_ioctl.c	20 Mar 2004 16:58:36 -0000	1.149
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/isl_ioctl.c	22 Mar 2004 11:21:22 -0000	1.150
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.c,v 1.149 2004/03/20 16:58:36 mcgrof Exp $
+/*  $Header: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.c,v 1.150 2004/03/22 11:21:22 ajfa Exp $
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *            (C) 2003,2004 Aurelien Alleaume <slts@xxxxxxx>
@@ -329,9 +329,9 @@
 	int rvalue;
 	u32 c;
 
-	if (fwrq->m  < 1000)
+	if (fwrq->m < 1000)
 		/* we have a channel number */
-		c =  fwrq->m;
+		c = fwrq->m;
 	else
 		c = (fwrq->e == 1) ? channel_of_freq(fwrq->m / 100000) : 0;
 
@@ -1893,7 +1893,8 @@
 	struct net_device *ndev = frame->ndev;
 	enum oid_num_t n = mgt_oidtonum(frame->header->oid);
 
-	prism54_process_trap_helper(netdev_priv(ndev), n, frame->data);
+	if (n != OID_NUM_LAST)
+		prism54_process_trap_helper(netdev_priv(ndev), n, frame->data);
 	islpci_mgt_release(frame);
 }
 
Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/oid_mgt.c
===================================================================
RCS file: /var/lib/cvs/prism54-ng/ksrc/oid_mgt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6.7-rc1/drivers/net/wireless/prism54/oid_mgt.c	20 Mar 2004 16:58:37 -0000	1.12
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/oid_mgt.c	22 Mar 2004 11:21:22 -0000	1.13
@@ -688,13 +688,13 @@
 {
 	int i;
 
-	for (i = 0; i < OID_NUM_LAST - 1; i++)
+	for (i = 0; i < OID_NUM_LAST; i++)
 		if (isl_oid[i].oid == oid)
 			return i;
 
 	printk(KERN_DEBUG "looking for an unknown oid 0x%x", oid);
 
-	return 0;
+	return OID_NUM_LAST;
 }
 
 int

Attachment: pgp00000.pgp
Description: PGP signature