diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 04:51:26 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 04:51:26 -0500 |
| commit | 62d65a8062530a4b2673999deb9be368fa60ca87 (patch) | |
| tree | 89ccd9b8de02b247f145275311378280ae26cdfb /drivers/net/ibm_emac/ibm_emac_core.h | |
| parent | f89b23217372ed9bdba8804c1616d445402d1e05 (diff) | |
| parent | ea182d4aefa3a27847d890b1592a608d1180aa45 (diff) | |
Merge branch 'upstream-fixes'
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; |