diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/cycx_drv.c | 1 | ||||
| -rw-r--r-- | drivers/net/depca.c | 6 | ||||
| -rw-r--r-- | drivers/net/irda/irtty.c | 1 | ||||
| -rw-r--r-- | drivers/net/yellowfin.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/cycx_drv.c b/drivers/net/cycx_drv.c index e75552e48..7f803c63d 100644 --- a/drivers/net/cycx_drv.c +++ b/drivers/net/cycx_drv.c @@ -39,7 +39,6 @@ * Aug 8, 1998 Arnaldo Initial version. */ -#include <linux/config.h> #ifdef MODULE #ifdef MODVERSIONS #include <linux/modversions.h> diff --git a/drivers/net/depca.c b/drivers/net/depca.c index c3701e230..68250ade1 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c @@ -221,11 +221,13 @@ by <tymm@computer.org> 0.451 5-Nov-98 Fixed mca stuff cuz I'm a dummy. <tymm@computer.org> 0.5 14-Nov-98 Re-spin for 2.1.x kernels. + 0.51 27-Jun-99 Correct received packet length for CRC from + report by <worm@dkik.dk> ========================================================================= */ -static const char *version = "depca.c:v0.5 1998/11/14 davies@maniac.ultranet.com\n"; +static const char *version = "depca.c:v0.51 1999/6/27 davies@maniac.ultranet.com\n"; #include <linux/config.h> #include <linux/module.h> @@ -947,7 +949,7 @@ depca_rx(struct device *dev) if (status & R_CRC) lp->stats.rx_crc_errors++; if (status & R_BUFF) lp->stats.rx_fifo_errors++; } else { - short len, pkt_len = readw(&lp->rx_ring[entry].msg_length); + short len, pkt_len = readw(&lp->rx_ring[entry].msg_length) - 4; struct sk_buff *skb; skb = dev_alloc_skb(pkt_len+2); diff --git a/drivers/net/irda/irtty.c b/drivers/net/irda/irtty.c index ad8d2dc0e..751d98ec7 100644 --- a/drivers/net/irda/irtty.c +++ b/drivers/net/irda/irtty.c @@ -24,7 +24,6 @@ * ********************************************************************/ -#include <linux/config.h> #include <linux/module.h> #include <asm/uaccess.h> #include <linux/kernel.h> diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 410121e2e..8d5b232ec 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c @@ -76,6 +76,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include <linux/pci.h> #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/bitops.h> +#include <asm/unaligned.h> #include <asm/io.h> #include <linux/netdevice.h> @@ -1054,7 +1055,7 @@ static int yellowfin_rx(struct device *dev) u16 desc_status = desc->status; int data_size = desc->request_cnt - desc->result_cnt; u8 *buf_addr = bus_to_virt(desc->addr); - s16 frame_status = *(s16*)&(buf_addr[data_size - 2]); /* ?Alpha safe on 885? */ + s16 frame_status = get_unaligned((s16*)(buf_addr+data_size-2)); if (yellowfin_debug > 4) printk(KERN_DEBUG " yellowfin_rx() status was %4.4x.\n", |