From 783c35f5cd5641f8ea8f6b581ec91b9ff428d531 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@exar.com>
Date: Fri, 10 Dec 2010 14:02:59 +0000
Subject: [PATCH] --- yaml --- r: 224985 b: refs/heads/master c:
 2e41f6449c561e6e3f572e11d0f2240bd51104db h: refs/heads/master i:   224983:
 ebc84f96c5658da77c9968869714434eed7fed1f v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/vxge/vxge-main.c | 19 ++++++++++++++-----
 trunk/drivers/net/vxge/vxge-main.h |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d8e7a916c92c..ba79ac12204a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee
+refs/heads/master: 2e41f6449c561e6e3f572e11d0f2240bd51104db
diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c
index faebffb02d12..3ec80684cd5f 100644
--- a/trunk/drivers/net/vxge/vxge-main.c
+++ b/trunk/drivers/net/vxge/vxge-main.c
@@ -1606,12 +1606,16 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
 	}
 
 	if (event == VXGE_LL_FULL_RESET) {
+		netif_carrier_off(vdev->ndev);
+
 		/* wait for all the vpath reset to complete */
 		for (vp_id = 0; vp_id < vdev->no_of_vpath; vp_id++) {
 			while (test_bit(vp_id, &vdev->vp_reset))
 				msleep(50);
 		}
 
+		netif_carrier_on(vdev->ndev);
+
 		/* if execution mode is set to debug, don't reset the adapter */
 		if (unlikely(vdev->exec_mode)) {
 			vxge_debug_init(VXGE_ERR,
@@ -1765,9 +1769,14 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
  *
  * driver may reset the chip on events of serr, eccerr, etc
  */
-static int vxge_reset(struct vxgedev *vdev)
+static void vxge_reset(struct work_struct *work)
 {
-	return do_vxge_reset(vdev, VXGE_LL_FULL_RESET);
+	struct vxgedev *vdev = container_of(work, struct vxgedev, reset_task);
+
+	if (!netif_running(vdev->ndev))
+		return;
+
+	do_vxge_reset(vdev, VXGE_LL_FULL_RESET);
 }
 
 /**
@@ -3111,8 +3120,7 @@ static int vxge_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
  * This function is triggered if the Tx Queue is stopped
  * for a pre-defined amount of time when the Interface is still up.
  */
-static void
-vxge_tx_watchdog(struct net_device *dev)
+static void vxge_tx_watchdog(struct net_device *dev)
 {
 	struct vxgedev *vdev;
 
@@ -3122,7 +3130,7 @@ vxge_tx_watchdog(struct net_device *dev)
 
 	vdev->cric_err_event = VXGE_HW_EVENT_RESET_START;
 
-	vxge_reset(vdev);
+	schedule_work(&vdev->reset_task);
 	vxge_debug_entryexit(VXGE_TRACE,
 		"%s:%d  Exiting...", __func__, __LINE__);
 }
@@ -3324,6 +3332,7 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
 	ndev->netdev_ops = &vxge_netdev_ops;
 
 	ndev->watchdog_timeo = VXGE_LL_WATCH_DOG_TIMEOUT;
+	INIT_WORK(&vdev->reset_task, vxge_reset);
 
 	vxge_initialize_ethtool_ops(ndev);
 
diff --git a/trunk/drivers/net/vxge/vxge-main.h b/trunk/drivers/net/vxge/vxge-main.h
index 256d5b406a67..5746fedc356f 100644
--- a/trunk/drivers/net/vxge/vxge-main.h
+++ b/trunk/drivers/net/vxge/vxge-main.h
@@ -395,6 +395,7 @@ struct vxgedev {
 	u32 		level_err;
 	u32 		level_trace;
 	char		fw_version[VXGE_HW_FW_STRLEN];
+	struct work_struct reset_task;
 };
 
 struct vxge_rx_priv {