diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /drivers/net/fc | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'drivers/net/fc')
| -rw-r--r-- | drivers/net/fc/iph5526.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c index 785a3fafd..28d50eb8c 100644 --- a/drivers/net/fc/iph5526.c +++ b/drivers/net/fc/iph5526.c @@ -218,6 +218,7 @@ static void update_scsi_oxid(struct fc_info *fi); Scsi_Host_Template driver_template = IPH5526_SCSI_FC; +static void iph5526_timeout(struct net_device *dev); #ifdef CONFIG_PCI static int iph5526_probe_pci(struct net_device *dev); @@ -286,6 +287,8 @@ static int __init fcdev_init(struct net_device *dev) dev->get_stats = iph5526_get_stats; dev->set_multicast_list = NULL; dev->change_mtu = iph5526_change_mtu; + dev->tx_timeout = iph5526_timeout; + dev->watchdog_timeo = 5*HZ; #ifndef MODULE fc_setup(dev); #endif |