- Add 99% of a callout based watchdog. The remaining 1% is waiting

  for pci_cfg_restore() to be exported.  It was tested using a
  hackily accessed pci_cfg_restore().

- Add ifmedia_removeall() to mxge_detach() in order to stop leaking
  an ifaddr

- Fix a small acounting bug introduced by the locking code shuffle
  which could cause spurious watchdog resets now that we have a
  watchdog.

Sponsored by: Myricom

1 files changed, 3 insertions, 1 deletions

diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h
index cf3c0d4..9b5d3bc 100644
--- a/sys/dev/mxge/if_mxge_var.h
+++ b/sys/dev/mxge/if_mxge_var.h
@@ -108,7 +108,8 @@ typedef struct
 	int boundary;			/* boundary transmits cannot cross*/
 	int stall;			/* #times hw queue exhausted */
 	int wake;			/* #times irq re-enabled xmit */
-
+	int watchdog_req;		/* cache of req */
+	int watchdog_done;		/* cache of done */
 } mxge_tx_buf_t;
 
 typedef struct {
@@ -160,6 +161,7 @@ typedef struct {
 	int fw_multicast_support;
 	int link_width;
 	mxge_dma_t dmabench_dma;
+	struct callout co_hdl;
 	char *mac_addr_string;
 	char product_code_string[64];
 	char serial_number_string[64];