Changeset 7c3fb9b in mainline for uspace/lib/nic/src
- Timestamp:
- 2018-05-17T08:29:01Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6ff23ff
- Parents:
- fac0ac7
- git-author:
- Jiri Svoboda <jiri@…> (2018-05-16 17:28:17)
- git-committer:
- Jiri Svoboda <jiri@…> (2018-05-17 08:29:01)
- Location:
- uspace/lib/nic/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/nic/src/nic_driver.c
rfac0ac7 r7c3fb9b 518 518 void nic_received_frame(nic_t *nic_data, nic_frame_t *frame) 519 519 { 520 /* Note: this function must not lock main lock, because loopback driver 521 * calls it inside send_frame handler (with locked main lock) */ 520 /* 521 * Note: this function must not lock main lock, because loopback driver 522 * calls it inside send_frame handler (with locked main lock) 523 */ 522 524 fibril_rwlock_read_lock(&nic_data->rxc_lock); 523 525 nic_frame_type_t frame_type; … … 1062 1064 if (remaining.tv_sec > 0) { 1063 1065 time_t wait_sec = remaining.tv_sec; 1064 /* wait maximaly 5 seconds to get reasonable reaction time 1066 /* 1067 * wait maximaly 5 seconds to get reasonable reaction time 1065 1068 * when period is reset 1066 1069 */ -
uspace/lib/nic/src/nic_impl.c
rfac0ac7 r7c3fb9b 123 123 sizeof(struct timeval)); 124 124 if (rc != EOK) { 125 /* We have already ran the on stopped handler, even if we 125 /* 126 * We have already ran the on stopped handler, even if we 126 127 * terminated the state change we would end up in undefined state. 127 * Therefore we just log the problem. */ 128 * Therefore we just log the problem. 129 */ 128 130 } 129 131 … … 302 304 rc = nic_rxc_unicast_set_mode(&nic_data->rx_control, mode, 303 305 addr_list, addr_count); 304 /* After changing the mode the addr db gets cleared, therefore we have 306 /* 307 * After changing the mode the addr db gets cleared, therefore we have 305 308 * to reinsert also the physical address of NIC. 306 309 */ … … 737 740 { 738 741 nic_t *nic_data = nic_get_from_ddf_fun(fun); 739 /* If the driver does not implement the poll mode change handler it cannot 740 * switch off interrupts and this is not supported. */ 742 /* 743 * If the driver does not implement the poll mode change handler it cannot 744 * switch off interrupts and this is not supported. 745 */ 741 746 if (nic_data->on_poll_mode_change == NULL) 742 747 return ENOTSUP;
Note:
See TracChangeset
for help on using the changeset viewer.