Linux Kernel Mailing List | 1 Jul 01:22 2004

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

ChangeSet 1.1782, 2004/06/30 16:22:46-07:00, torvalds <at> ppc970.osdl.org

	Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
	into ppc970.osdl.org:/home/torvalds/v2.6/linux

 0 files changed

Linux Kernel Mailing List | 1 Jul 05:16 2004

http://xfs.org:8090/xfs-linux-2.6

ChangeSet 1.1783, 2004/06/30 20:16:17-07:00, torvalds <at> ppc970.osdl.org

	Merge http://xfs.org:8090/xfs-linux-2.6
	into ppc970.osdl.org:/home/torvalds/v2.6/linux

 0 files changed

Linux Kernel Mailing List | 1 Jul 03:25 2004

[XFS] Don't dereference buffer after pagebuf_iostrategy()

ChangeSet 1.1778.2.1, 2004/07/01 11:25:51+10:00, hch <at> sgi.com

	[XFS] Don't dereference buffer after pagebuf_iostrategy()
	
	SGI Modid: xfs-linux:xfs-kern:174326a
	Signed-off-by: Nathan Scott <nathans <at> sgi.com>

 xfs_buf.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -Nru a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
--- a/fs/xfs/linux-2.6/xfs_buf.c	2004-06-30 21:09:03 -07:00
+++ b/fs/xfs/linux-2.6/xfs_buf.c	2004-06-30 21:09:03 -07:00
 <at>  <at>  -1614,6 +1614,7  <at>  <at> 
 {
 	struct list_head	tmp;
 	unsigned long		age;
+	xfs_buftarg_t		*target;
 	xfs_buf_t		*pb, *n;

 	/*  Set up the thread  */
 <at>  <at>  -1656,9 +1657,12  <at>  <at> 

 		while (!list_empty(&tmp)) {
 			pb = list_entry(tmp.next, xfs_buf_t, pb_list);
+			target = pb->pb_target;
+
 			list_del_init(&pb->pb_list);
 			pagebuf_iostrategy(pb);
-			blk_run_address_space(pb->pb_target->pbr_mapping);
(Continue reading)

Linux Kernel Mailing List | 1 Jul 05:16 2004

[PATCH] prism54 cleanup functions

ChangeSet 1.1782.1.1, 2004/06/30 23:16:26-04:00, margitsw <at> t-online.de

	[PATCH] prism54 cleanup functions
	
	2004-06-28 Margit Schubert-While <margitsw <at> t-online.de>
	
	* Clean up function definitions (missing static, extraneous inline)

 isl_ioctl.c  |    4 ++--
 islpci_dev.c |    7 +++++--
 islpci_dev.h |    2 --
 oid_mgt.c    |    4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff -Nru a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
--- a/drivers/net/wireless/prism54/isl_ioctl.c	2004-07-01 12:08:07 -07:00
+++ b/drivers/net/wireless/prism54/isl_ioctl.c	2004-07-01 12:08:07 -07:00
 <at>  <at>  -577,7 +577,7  <at>  <at> 
  * the "Aironet driver for 4500 and 4800 series cards" (GPL)
  */

-inline char *
+static char *
 prism54_translate_bss(struct net_device *ndev, char *current_ev,
 		      char *end_buf, struct obj_bss *bss, char noise)
 {
 <at>  <at>  -1502,7 +1502,7  <at>  <at> 

 /* Translate a TRAP oid into a wireless event. Called in islpci_mgt_receive. */

(Continue reading)

Linux Kernel Mailing List | 1 Jul 05:16 2004

[PATCH] prism54 missing error check

ChangeSet 1.1782.1.2, 2004/06/30 23:16:36-04:00, margitsw <at> t-online.de

	[PATCH] prism54 missing error check
	
	2004-06-28 Margit Schubert-While <margitsw <at> t-online.de>
	
	* Missing error check after dev_alloc_skb

 islpci_eth.c |    6 ++++++
 1 files changed, 6 insertions(+)

diff -Nru a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
--- a/drivers/net/wireless/prism54/islpci_eth.c	2004-07-01 12:08:27 -07:00
+++ b/drivers/net/wireless/prism54/islpci_eth.c	2004-07-01 12:08:27 -07:00
 <at>  <at>  -156,6 +156,12  <at>  <at> 
 		} else {
 			newskb =
 			    dev_alloc_skb(init_wds ? skb->len + 6 : skb->len);
+			if (unlikely(newskb == NULL)) {
+				printk(KERN_ERR "%s: Cannot allocate skb\n",
+				       ndev->name);
+				err = -ENOMEM;
+				goto drop_free;
+			}
 			newskb_offset = (4 - (long) newskb->data) & 0x03;

 			/* Check if newskb->data is aligned */
Linux Kernel Mailing List | 1 Jul 05:16 2004

[PATCH] prism54 fix unlikely

ChangeSet 1.1782.1.3, 2004/06/30 23:16:45-04:00, margitsw <at> t-online.de

	[PATCH] prism54 fix unlikely
	
	2004-06-28 Margit Schubert-While <margitsw <at> t-online.de>
	
	* Fix a thinko by me

 islpci_eth.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -Nru a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
--- a/drivers/net/wireless/prism54/islpci_eth.c	2004-07-01 12:08:38 -07:00
+++ b/drivers/net/wireless/prism54/islpci_eth.c	2004-07-01 12:08:38 -07:00
 <at>  <at>  -121,7 +121,7  <at>  <at> 
 	/* Check alignment and WDS frame formatting. The start of the packet should
 	 * be aligned on a 4-byte boundary. If WDS is enabled add another 6 bytes
 	 * and add WDS address information */
-	if (unlikely(((long) skb->data & 0x03) | init_wds)) {
+	if (likely(((long) skb->data & 0x03) | init_wds)) {
 		/* get the number of bytes to add and re-allign */
 		offset = (4 - (long) skb->data) & 0x03;
 		offset += init_wds ? 6 : 0;
Linux Kernel Mailing List | 1 Jul 05:16 2004

[PATCH] prism54 device list cleanup

ChangeSet 1.1782.1.4, 2004/06/30 23:16:54-04:00, margitsw <at> t-online.de

	[PATCH] prism54 device list cleanup
	
	2004-06-28 Margit Schubert-While <margitsw <at> t-online.de>
	
	* Clean up the device table

 islpci_hotplug.c |  116 ++++++++++++++++++++++++++++++++++++++-----------------
 islpci_mgt.h     |    3 +
 2 files changed, 84 insertions(+), 35 deletions(-)

diff -Nru a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
--- a/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-01 12:08:49 -07:00
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-01 12:08:49 -07:00
 <at>  <at>  -38,81 +38,111  <at>  <at> 

 /* In this order: vendor, device, subvendor, subdevice, class, class_mask,
  * driver_data 
- * Note: for driver_data we put the device's name 
  * If you have an update for this please contact prism54-devel <at> prism54.org 
  * The latest list can be found at http://prism54.org/supported_cards.php */
 static const struct pci_device_id prism54_id_tbl[] = {
+	/* 3COM 3CRWE154G72 Wireless LAN adapter */
 	{
 	 PCIVENDOR_3COM, PCIDEVICE_3COM6001,
 	 PCIVENDOR_3COM, PCIDEVICE_3COM6001,
-	 0, 0,
-	 (unsigned long) "3COM 3CRWE154G72 Wireless LAN adapter"},
+	 0, 0, 0
(Continue reading)

Linux Kernel Mailing List | 1 Jul 05:17 2004

[PATCH] prism54 remove prog reg poke

ChangeSet 1.1782.1.5, 2004/06/30 23:17:03-04:00, margitsw <at> t-online.de

	[PATCH] prism54 remove prog reg poke
	
	2004-06-28 Margit Schubert-While <margitsw <at> t-online.de>
	
	* Don't poke around in the timeout registers

 islpci_hotplug.c |    5 +++++
 1 files changed, 5 insertions(+)

diff -Nru a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
--- a/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-01 12:08:59 -07:00
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-01 12:08:59 -07:00
 <at>  <at>  -293,8 +293,13  <at>  <at> 
 	 * 	Writing zero to both these two registers will disable both timeouts and
 	 * 	*can* solve problems caused by devices that are slow to respond.
 	 */
+	/*	I am taking these out, we should not be poking around in the
+	 *	programmable timers - MSW
+	*/
+/*	Do not zero the programmable timers
 	pci_write_config_byte(pdev, 0x40, 0);
 	pci_write_config_byte(pdev, 0x41, 0);
+*/

 	/* request the pci device I/O regions */
 	rvalue = pci_request_regions(pdev, DRV_NAME);
Linux Kernel Mailing List | 1 Jul 05:17 2004

[PATCH] prism54 use set_pci_mwi()

ChangeSet 1.1782.1.6, 2004/06/30 23:17:12-04:00, margitsw <at> t-online.de

	[PATCH] prism54 use set_pci_mwi()
	
	2004-06-28 Margit Schubert-While <margitsw <at> t-online.de>
	
	* Use set_pci_mwi()

 islpci_hotplug.c |    3 +++
 1 files changed, 3 insertions(+)

diff -Nru a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
--- a/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-01 12:09:09 -07:00
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-01 12:09:09 -07:00
 <at>  <at>  -321,6 +321,9  <at>  <at> 
 	DEBUG(SHOW_TRACING, "%s: pci_set_master(pdev)\n", DRV_NAME);
 	pci_set_master(pdev);

+	/* enable MWI */
+	pci_set_mwi(pdev);
+
 	/* setup the network device interface and its structure */
 	if (!(ndev = islpci_setup(pdev))) {
 		/* error configuring the driver as a network device */
Linux Kernel Mailing List | 1 Jul 05:20 2004

[PATCH] pcnet32: Add HomePNA parameter for 79C978.

ChangeSet 1.1782.1.8, 2004/06/30 23:20:27-04:00, brazilnut <at> us.ibm.com

	[PATCH] pcnet32: Add HomePNA parameter for 79C978.
	
	This patch adds a module parameter to select HomePNA mode of operation for
	the 79C978 version of the pcnet32.  Tested ia32 and ppc64.
	
	signed-off-by: Patrick Simmons <psimmons <at> flash.net>
	signed-off-by: Don Fry <brazilnut <at> us.ibm.com>

 pcnet32.c |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff -Nru a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
--- a/drivers/net/pcnet32.c	2004-07-01 12:09:28 -07:00
+++ b/drivers/net/pcnet32.c	2004-07-01 12:09:28 -07:00
 <at>  <at>  -22,8 +22,8  <at>  <at> 
  *************************************************************************/

 #define DRV_NAME	"pcnet32"
-#define DRV_VERSION	"1.30f"
-#define DRV_RELDATE	"06.16.2004"
+#define DRV_VERSION	"1.30g"
+#define DRV_RELDATE	"06.22.2004"
 #define PFX		DRV_NAME ": "

 static const char *version =
 <at>  <at>  -137,6 +137,7  <at>  <at> 
 #define MAX_UNITS 8	/* More are supported, limit only on options */
 static int options[MAX_UNITS];
(Continue reading)


Gmane