X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fsky2.h;h=72e12b7cfa40e27dd5af5e25e9294b416feef325;hb=5f08e46b621a769e52a9545a23ab1d5fb2aec1d4;hp=dce4d276d4435e685232c7073ae98d26b9e1f818;hpb=5e16e3f0e24dadb79b96b6134cd3303f0d42f0c5;p=linux-2.6

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index dce4d276d4..72e12b7cfa 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2045,12 +2045,13 @@ struct sky2_hw {
 	u8		     chip_rev;
 	u8		     pmd_type;
 	u8		     ports;
+	u8		     active;
 
 	struct sky2_status_le *st_le;
 	u32		     st_idx;
 	dma_addr_t   	     st_dma;
 
-	struct timer_list    idle_timer;
+	struct timer_list    watchdog_timer;
 	struct work_struct   restart_work;
 	int		     msi;
 	wait_queue_head_t    msi_wait;