diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-05 11:15:30 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-05 11:15:30 -0800 |
| commit | c89a86bb96307019867d11874ef0b86adaa0598e (patch) | |
| tree | c44c1a825e8a143a4c52bcb8692292aeb77fa64e /drivers/net/ibm_emac/ibm_emac_core.h | |
| parent | 07475ffba5800c53573180dd521273642adcd0e9 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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; |