diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:08:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:08:17 -0500 |
| commit | fd8a882b612de93b351996ed42a9557afc1f8c34 (patch) | |
| tree | baadcaa7217cc40f41f04eb40c0d1236cf462716 /drivers/net/ibm_emac/ibm_emac_core.h | |
| parent | c8a4f06e4b27dba425ed49fa603d9257e4cd9ece (diff) | |
| parent | 3b6efee9231e12fce09c94930bfc59f66f18d662 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/ibm_emac/ibm_emac_core.h')
| -rw-r--r-- | drivers/net/ibm_emac/ibm_emac_core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h index e9b44d030ac..911abbaf471 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.h +++ b/drivers/net/ibm_emac/ibm_emac_core.h @@ -189,6 +189,8 @@ struct ocp_enet_private { struct timer_list link_timer; int reset_failed; + int stop_timeout; /* in us */ + struct ibm_emac_error_stats estats; struct net_device_stats nstats; |