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 /net | |
| parent | 66f20d0f9bd86dc11f3869d78f3c5749789323ee (diff) | |
Merge with 2.4.0-test4-pre2.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/reassembly.c | 1 | ||||
| -rw-r--r-- | net/irda/irlan/irlan_eth.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index abdcdc713..190551d79 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -23,6 +23,7 @@ * Horst von Brand Add missing #include <linux/string.h> * Alexey Kuznetsov SMP races, threading, cleanup. */ +#include <linux/config.h> #include <linux/errno.h> #include <linux/types.h> #include <linux/string.h> diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index c0d9878f1..1b46ab5b8 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c @@ -409,7 +409,7 @@ void irlan_eth_set_multicast_list(struct net_device *dev) * Get the current statistics for this device * */ -struct enet_statistics *irlan_eth_get_stats(struct net_device *dev) +struct net_device_stats *irlan_eth_get_stats(struct net_device *dev) { struct irlan_cb *self = (struct irlan_cb *) dev->priv; |