Changeset 3bacee1 in mainline for uspace/drv/nic/ne2k/dp8390.c
- Timestamp:
- 2018-04-12T16:27:17Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3cf22f9
- Parents:
- 76d0981d
- git-author:
- Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)
- git-committer:
- Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/nic/ne2k/dp8390.c
r76d0981d r3bacee1 439 439 440 440 static nic_frame_t *ne2k_receive_frame(nic_t *nic_data, uint8_t page, 441 441 size_t length) 442 442 { 443 443 ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); … … 451 451 452 452 if (last >= ne2k->stop_page) { 453 size_t left = (ne2k->stop_page - page) * DP_PAGE 454 -sizeof(recv_header_t);453 size_t left = (ne2k->stop_page - page) * DP_PAGE - 454 sizeof(recv_header_t); 455 455 ne2k_download(ne2k, frame->data, page * DP_PAGE + sizeof(recv_header_t), 456 456 left); … … 509 509 uint8_t next = header.next; 510 510 511 if ((length < ETH_MIN_PACK_SIZE) 512 ||(length > ETH_MAX_PACK_SIZE_TAGGED)) {511 if ((length < ETH_MIN_PACK_SIZE) || 512 (length > ETH_MAX_PACK_SIZE_TAGGED)) { 513 513 next = current; 514 } else if ((header.next < ne2k->start_page) 515 ||(header.next > ne2k->stop_page)) {514 } else if ((header.next < ne2k->start_page) || 515 (header.next > ne2k->stop_page)) { 516 516 next = current; 517 517 } else if (header.status & RSR_FO) { … … 525 525 if (frames != NULL) { 526 526 nic_frame_t *frame = 527 527 ne2k_receive_frame(nic_data, boundary, length); 528 528 if (frame != NULL) { 529 529 nic_frame_list_append(frames, frame); … … 558 558 if (tsr & TSR_COL) { 559 559 nic_report_collisions(nic_data, 560 560 pio_read_8(ne2k->port + DP_NCR) & 15); 561 561 } 562 562
Note:
See TracChangeset
for help on using the changeset viewer.