svn commit: r193696 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb

[Kip Macy]

Author: kmacy
Date: Mon Jun  8 08:26:13 2009
New Revision: 193696
URL: http://svn.freebsd.org/changeset/base/193696

Log:
  remove unused watchdog_timer field

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h	Mon Jun  8 08:16:42 2009	(r193695)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h	Mon Jun  8 08:26:13 2009	(r193696)
@@ -104,7 +104,6 @@ struct port_info {
 	uint32_t        first_qset;
 	uint32_t	nqsets;
 	int		link_fault;
-	int		watchdog_timer;
 
 	uint8_t		hw_addr[ETHER_ADDR_LEN];
 	struct task	timer_reclaim_task;

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Mon Jun  8 08:16:42 2009	(r193695)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Mon Jun  8 08:26:13 2009	(r193696)
@@ -1609,8 +1609,6 @@ cxgb_start_locked(struct sge_qset *qs)
 			m_freem(m_head);
 
 		m_head = NULL;
-		/* Set timeout in case hardware has problems transmitting. */
-		pi->watchdog_timer = CXGB_TX_TIMEOUT;
 	}
 	if (!TXQ_RING_EMPTY(qs) && callout_pending(&txq->txq_timer) == 0)
 		callout_reset_on(&txq->txq_timer, 1, cxgb_tx_timeout,