## Automatically generated incremental diff
## From:   linux-2.4.22-bk48
## To:     linux-2.4.22-bk49
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.22-bk48/Makefile linux-2.4.22-bk49/Makefile
--- linux-2.4.22-bk48/Makefile	2003-11-07 02:50:37.000000000 -0800
+++ linux-2.4.22-bk49/Makefile	2003-11-07 02:50:44.000000000 -0800
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -bk48
+EXTRAVERSION = -bk49
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.22-bk48/drivers/net/tg3.c linux-2.4.22-bk49/drivers/net/tg3.c
--- linux-2.4.22-bk48/drivers/net/tg3.c	2003-11-07 02:50:40.000000000 -0800
+++ linux-2.4.22-bk49/drivers/net/tg3.c	2003-11-07 02:50:50.000000000 -0800
@@ -55,8 +55,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"2.2"
-#define DRV_MODULE_RELDATE	"August 24, 2003"
+#define DRV_MODULE_VERSION	"2.3"
+#define DRV_MODULE_RELDATE	"November 5, 2003"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
@@ -5934,6 +5934,10 @@
 					tp->link_config.phy_is_low_power)
 		return -EAGAIN;
 
+	spin_lock_irq(&tp->lock);
+	spin_lock(&tp->tx_lock);
+
+	tp->link_config.autoneg = cmd->autoneg;
 	if (cmd->autoneg == AUTONEG_ENABLE) {
 		tp->link_config.advertising = cmd->advertising;
 		tp->link_config.speed = SPEED_INVALID;
diff -urN linux-2.4.22-bk48/fs/dquot.c linux-2.4.22-bk49/fs/dquot.c
--- linux-2.4.22-bk48/fs/dquot.c	2003-08-25 04:44:43.000000000 -0700
+++ linux-2.4.22-bk49/fs/dquot.c	2003-11-07 02:50:55.000000000 -0800
@@ -392,6 +392,7 @@
 		 * is enough since if dquot is locked/modified it can't be
 		 * on the free list */
 		get_dquot_ref(dquot);
+		dqstats.lookups++;
 		if (dquot->dq_flags & DQ_LOCKED)
 			wait_on_dquot(dquot);
 		if (dquot_dirty(dquot))
@@ -622,7 +623,6 @@
 		dqput(dquot);
 		return NODQUOT;
 	}
-	++dquot->dq_referenced;
 	dqstats.lookups++;
 
 	return dquot;
@@ -642,7 +642,6 @@
 	if (dquot->dq_flags & DQ_LOCKED)
 		printk(KERN_ERR "VFS: dqduplicate(): Locked quota to be duplicated!\n");
 	get_dquot_dup_ref(dquot);
-	dquot->dq_referenced++;
 	dqstats.lookups++;
 
 	return dquot;
diff -urN linux-2.4.22-bk48/include/linux/quota.h linux-2.4.22-bk49/include/linux/quota.h
--- linux-2.4.22-bk48/include/linux/quota.h	2003-08-25 04:44:44.000000000 -0700
+++ linux-2.4.22-bk49/include/linux/quota.h	2003-11-07 02:50:57.000000000 -0800
@@ -222,8 +222,6 @@
 	loff_t dq_off;			/* Offset of dquot on disk */
 	short dq_type;			/* Type of quota */
 	short dq_flags;			/* See DQ_* */
-	unsigned long dq_referenced;	/* Number of times this dquot was 
-					   referenced during its lifetime */
 	struct mem_dqblk dq_dqb;	/* Diskquota usage */
 };
 
