summaryrefslogtreecommitdiffstats
path: root/include/net/irda
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-12 01:43:08 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-12 01:43:08 +0000
commitf4ae78d536e6dfaeb24c01b331fc38d950ed062b (patch)
tree6930a78aa7cc4ee1829d50d3bcbaf0dbe9e2e905 /include/net/irda
parent66f20d0f9bd86dc11f3869d78f3c5749789323ee (diff)
Merge with 2.4.0-test4-pre2.
Diffstat (limited to 'include/net/irda')
-rw-r--r--include/net/irda/irlan_common.h2
-rw-r--r--include/net/irda/irlan_eth.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/irda/irlan_common.h b/include/net/irda/irlan_common.h
index af897c754..9ed6a9c36 100644
--- a/include/net/irda/irlan_common.h
+++ b/include/net/irda/irlan_common.h
@@ -165,7 +165,7 @@ struct irlan_cb {
int magic;
struct net_device dev; /* Ethernet device structure*/
- struct enet_statistics stats;
+ struct net_device_stats stats;
__u32 saddr; /* Source device address */
__u32 daddr; /* Destination device address */
diff --git a/include/net/irda/irlan_eth.h b/include/net/irda/irlan_eth.h
index 8f0ca03ac..53c6ae82b 100644
--- a/include/net/irda/irlan_eth.h
+++ b/include/net/irda/irlan_eth.h
@@ -35,6 +35,6 @@ void irlan_eth_flow_indication( void *instance, void *sap, LOCAL_FLOW flow);
void irlan_eth_send_gratuitous_arp(struct net_device *dev);
void irlan_eth_set_multicast_list( struct net_device *dev);
-struct enet_statistics *irlan_eth_get_stats(struct net_device *dev);
+struct net_device_stats *irlan_eth_get_stats(struct net_device *dev);
#endif