aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/s2io.h')
-rw-r--r--drivers/net/s2io.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index ce9bf6d5ee00..263fe7a1b903 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -624,6 +624,9 @@ struct s2io_nic {
624 struct tasklet_struct task; 624 struct tasklet_struct task;
625 volatile unsigned long tasklet_status; 625 volatile unsigned long tasklet_status;
626 626
627 /* Timer that handles I/O errors/exceptions */
628 struct timer_list alarm_timer;
629
627 /* Space to back up the PCI config space */ 630 /* Space to back up the PCI config space */
628 u32 config_space[256 / sizeof(u32)]; 631 u32 config_space[256 / sizeof(u32)];
629 632
@@ -819,6 +822,7 @@ static int s2io_poll(struct net_device *dev, int *budget);
819#endif 822#endif
820static void s2io_init_pci(nic_t * sp); 823static void s2io_init_pci(nic_t * sp);
821int s2io_set_mac_addr(struct net_device *dev, u8 * addr); 824int s2io_set_mac_addr(struct net_device *dev, u8 * addr);
825static void s2io_alarm_handle(unsigned long data);
822static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs); 826static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs);
823static int verify_xena_quiescence(nic_t *sp, u64 val64, int flag); 827static int verify_xena_quiescence(nic_t *sp, u64 val64, int flag);
824static struct ethtool_ops netdev_ethtool_ops; 828static struct ethtool_ops netdev_ethtool_ops;