Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize totlen in ae_put. Thanks to chopps for pointing it out! 

Also, switch back from using struct ed_ring to using struct ae_ring
because BYTE_ORDER == BIG_ENDIAN, but the card is in x86 byte order
mode because NuBUS does the swap "for us" on 16- and 32-bit transfers.
We should probably figure some way to use the std ed_ring if/when
all the 8390 drivers are all fully merged.
This commit is contained in:
briggs 1995-04-19 04:43:36 +00:00
parent 19c27da954
commit 2b1a13ab2f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/mac68k/dev/if_ae.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ae.c,v 1.23 1995/04/16 00:14:54 briggs Exp $ */
/* $NetBSD: if_ae.c,v 1.24 1995/04/19 04:43:36 briggs Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@ -715,7 +715,7 @@ ae_rint(sc)
u_char boundary, current;
u_short len;
u_char nlen;
struct ed_ring packet_hdr;
struct ae_ring packet_hdr;
caddr_t packet_ptr;
loop:
@ -746,7 +746,7 @@ loop:
* The byte count includes a 4 byte header that was added by
* the NIC.
*/
packet_hdr = *(struct ed_ring *)packet_ptr;
packet_hdr = *(struct ae_ring *)packet_ptr;
packet_hdr.count =
((packet_hdr.count >> 8) & 0xff) |
((packet_hdr.count & 0xff) << 8);
@ -792,8 +792,8 @@ loop:
packet_hdr.next_packet >= sc->rec_page_start &&
packet_hdr.next_packet < sc->rec_page_stop) {
/* Go get packet. */
ae_get_packet(sc, packet_ptr + sizeof(struct ed_ring),
len - sizeof(struct ed_ring));
ae_get_packet(sc, packet_ptr + sizeof(struct ae_ring),
len - sizeof(struct ae_ring));
++sc->sc_arpcom.ac_if.if_ipackets;
} else {
/* Really BAD. The ring pointers are corrupted. */
@ -1341,7 +1341,7 @@ ae_put(sc, m, buf)
{
u_char *data, savebyte[2];
int len, wantbyte;
u_short totlen;
u_short totlen=0;
wantbyte = 0;