diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:43:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:43:08 +0000 |
commit | f4ae78d536e6dfaeb24c01b331fc38d950ed062b (patch) | |
tree | 6930a78aa7cc4ee1829d50d3bcbaf0dbe9e2e905 /drivers/net/tokenring/smctr.c | |
parent | 66f20d0f9bd86dc11f3869d78f3c5749789323ee (diff) |
Merge with 2.4.0-test4-pre2.
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
-rw-r--r-- | drivers/net/tokenring/smctr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 0fefb11ed..e9481039d 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c @@ -124,7 +124,7 @@ static unsigned int smctr_get_num_rx_bdbs(struct net_device *dev); static int smctr_get_physical_drop_number(struct net_device *dev); static __u8 *smctr_get_rx_pointer(struct net_device *dev, short queue); static int smctr_get_station_id(struct net_device *dev); -static struct enet_statistics *smctr_get_stats(struct net_device *dev); +static struct net_device_stats *smctr_get_stats(struct net_device *dev); static FCBlock *smctr_get_tx_fcb(struct net_device *dev, __u16 queue, __u16 bytes_count); static int smctr_get_upstream_neighbor_addr(struct net_device *dev); @@ -1402,11 +1402,11 @@ static int smctr_get_station_id(struct net_device *dev) * Get the current statistics. This may be called with the card open * or closed. */ -static struct enet_statistics *smctr_get_stats(struct net_device *dev) +static struct net_device_stats *smctr_get_stats(struct net_device *dev) { struct net_local *tp = (struct net_local *)dev->priv; - return ((struct enet_statistics *)&tp->MacStat); + return ((struct net_device_stats *)&tp->MacStat); } static FCBlock *smctr_get_tx_fcb(struct net_device *dev, __u16 queue, |