atl1: disable broken 64-bit DMA

[linux-2.6] / drivers / net / sky2.h

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 8df4643493d19408b81c33418a942ac378408274..72e12b7cfa40e27dd5af5e25e9294b416feef325 100644 (file)
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1998,6 +1998,7 @@ struct sky2_port {
        struct sky2_tx_le    *tx_le;
        u16                  tx_cons;           /* next le to check */
        u16                  tx_prod;           /* next le to use */
+       u16                  tx_next;           /* debug only */
        u32                  tx_addr64;
        u16                  tx_pending;
        u16                  tx_last_mss;
@@ -2028,6 +2029,9 @@ struct sky2_port {
        enum flow_control    flow_mode;
        enum flow_control    flow_status;
 
+#ifdef CONFIG_SKY2_DEBUG
+       struct dentry        *debugfs;
+#endif
        struct net_device_stats net_stats;
 
 };
@@ -2041,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;