[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-netdev
Subject:    [PATCH 8/17 linux-2.6.7-rc2] prism54: Fix bugs 74/75
From:       margitsw () t-online ! de (Margit Schubert-While)
Date:       2004-05-30 19:53:59
Message-ID: 5.1.0.14.2.20040530214358.00b0b560 () pop ! t-online ! de
[Download RAW message or body]

2004-03-22      Aurelien Alleaume <slts@free.fr>

         * oid_mgt.c, isl_ioctl.c : Minor bugfixes : #74 and #75.
["08-fix-bug-74-75.patch" (application/octet-stream)]

diff -NaurEb linux-2.6.6ct/drivers/net/wireless/prism54/isl_ioctl.c \
                linux-2.6.6-01/drivers/net/wireless/prism54/isl_ioctl.c
--- linux-2.6.6ct/drivers/net/wireless/prism54/isl_ioctl.c	2004-05-28 \
                14:40:26.990455656 +0200
+++ linux-2.6.6-01/drivers/net/wireless/prism54/isl_ioctl.c	2004-05-28 \
14:43:00.926053888 +0200 @@ -1893,6 +1893,7 @@
 	struct net_device *ndev = frame->ndev;
 	enum oid_num_t n = mgt_oidtonum(frame->header->oid);
 
+	if (n != OID_NUM_LAST)
 	prism54_process_trap_helper(netdev_priv(ndev), n, frame->data);
 	islpci_mgt_release(frame);
 }
diff -NaurEb linux-2.6.6ct/drivers/net/wireless/prism54/oid_mgt.c \
                linux-2.6.6-01/drivers/net/wireless/prism54/oid_mgt.c
--- linux-2.6.6ct/drivers/net/wireless/prism54/oid_mgt.c	2004-05-28 \
                14:40:27.001453984 +0200
+++ linux-2.6.6-01/drivers/net/wireless/prism54/oid_mgt.c	2004-05-28 \
14:43:00.929053432 +0200 @@ -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



[prev in list] [next in list] [prev in thread] [next in thread]