Index: uspace/lib/nic/include/nic.h =================================================================== --- uspace/lib/nic/include/nic.h (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) +++ uspace/lib/nic/include/nic.h (revision 3fe58d3c98a1a1ef32bfc4718efd64ae275de456) @@ -42,5 +42,4 @@ #include #include -#include #include @@ -72,6 +71,6 @@ /** - * Handler for writing packet data to the NIC device. - * The function is responsible for releasing the packet. + * Handler for writing frame data to the NIC device. + * The function is responsible for releasing the frame. * It does not return anything, if some error is detected the function just * silently fails (logging on debug level is suggested). @@ -159,5 +158,5 @@ * @return ENOTSUP If this filter cannot work on this NIC (e.g. the NIC * cannot run in promiscuous node or the limit of WOL - * packets' specifications was reached). + * frames' specifications was reached). * @return ELIMIT If this filter must implemented in HW but currently the * limit of these HW filters was reached. @@ -234,5 +233,5 @@ extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *); extern void nic_query_address(nic_t *, nic_address_t *); -extern void nic_received_noneth_packet(nic_t *, packet_t *); +extern void nic_received_noneth_frame(nic_t *, void *, size_t); extern void nic_received_frame(nic_t *, nic_frame_t *); extern void nic_received_frame_list(nic_t *, nic_frame_list_t *); @@ -248,7 +247,5 @@ extern void nic_report_collisions(nic_t *, unsigned); -/* Packet / frame / frame list allocation and deallocation */ -extern packet_t *nic_alloc_packet(nic_t *, size_t); -extern void nic_release_packet(nic_t *, packet_t *); +/* Frame / frame list allocation and deallocation */ extern nic_frame_t *nic_alloc_frame(nic_t *, size_t); extern nic_frame_list_t *nic_alloc_frame_list(void); @@ -275,8 +272,4 @@ extern void nic_sw_period_stop(nic_t *); -/* Packet DMA lock */ -extern int nic_dma_lock_packet(packet_t *, size_t, void **); -extern int nic_dma_unlock_packet(packet_t *, size_t); - #endif // __NIC_H__ Index: uspace/lib/nic/include/nic_rx_control.h =================================================================== --- uspace/lib/nic/include/nic_rx_control.h (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) +++ uspace/lib/nic/include/nic_rx_control.h (revision 3fe58d3c98a1a1ef32bfc4718efd64ae275de456) @@ -46,5 +46,4 @@ #include #include -#include #include "nic_addr_db.h" Index: uspace/lib/nic/src/nic_driver.c =================================================================== --- uspace/lib/nic/src/nic_driver.c (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) +++ uspace/lib/nic/src/nic_driver.c (revision 3fe58d3c98a1a1ef32bfc4718efd64ae275de456) @@ -51,7 +51,4 @@ #include #include -#include -#include -#include #include @@ -64,5 +61,5 @@ /** - * Initializes libraries required for NIC framework - logger, packet manager + * Initializes libraries required for NIC framework - logger * * @param name Name of the device/driver (used in logging) @@ -79,6 +76,5 @@ snprintf(buffer, 256, "drv/" DEVICE_CATEGORY_NIC "/%s", name); - /* Initialize packet manager */ - return pm_init(); + return EOK; } @@ -162,5 +158,5 @@ /** - * Setup write packet handler. This MUST be called in the add_device handler + * Setup send frame handler. This MUST be called in the add_device handler * if the nic_send_message_impl function is used for sending messages (filled * as send_message member of the nic_iface_t structure). The function must not @@ -270,22 +266,5 @@ } -/** - * Just a wrapper over the packet_get_1_remote function - */ -packet_t *nic_alloc_packet(nic_t *nic_data, size_t data_size) -{ - return packet_get_1_remote(nic_data->net_session, data_size); -} - - -/** - * Just a wrapper over the pq_release_remote function - */ -void nic_release_packet(nic_t *nic_data, packet_t *packet) -{ - pq_release_remote(nic_data->net_session, packet_get_id(packet)); -} - -/** Allocate frame and packet +/** Allocate frame * * @param nic_data The NIC driver data @@ -607,5 +586,5 @@ /** - * The busy flag can be set to 1 only in the write_packet handler, to 0 it can + * The busy flag can be set to 1 only in the send_frame handler, to 0 it can * be set anywhere. * @@ -616,5 +595,5 @@ { /* - * When the function is called in write_packet handler the main lock is + * When the function is called in send_frame handler the main lock is * locked so no race can happen. * Otherwise, when it is unexpectedly set to 0 (even with main lock held @@ -635,5 +614,5 @@ { /* Note: this function must not lock main lock, because loopback driver - * calls it inside write_packet handler (with locked main lock) */ + * calls it inside send_frame handler (with locked main lock) */ fibril_rwlock_read_lock(&nic_data->rxc_lock); nic_frame_type_t frame_type; @@ -643,5 +622,5 @@ /* Update statistics */ fibril_rwlock_write_lock(&nic_data->stats_lock); - /* Both sending message up and releasing packet are atomic IPC calls */ + if (nic_data->state == NIC_STATE_ACTIVE && check) { nic_data->stats.receive_packets++; @@ -679,25 +658,26 @@ /** * This function is to be used only in the loopback driver. It's workaround - * for the situation when the packet does not contain ethernet address. + * for the situation when the frame does not contain ethernet address. * The filtering is therefore not applied here. * * @param nic_data - * @param packet - */ -void nic_received_noneth_packet(nic_t *nic_data, packet_t *packet) + * @param data Frame data + * @param size Frame size in bytes + */ +void nic_received_noneth_frame(nic_t *nic_data, void *data, size_t size) { fibril_rwlock_write_lock(&nic_data->stats_lock); nic_data->stats.receive_packets++; - nic_data->stats.receive_bytes += packet_get_data_length(packet); + nic_data->stats.receive_bytes += size; fibril_rwlock_write_unlock(&nic_data->stats_lock); nil_received_msg(nic_data->nil_session, nic_data->device_id, - packet_get_data(packet), packet_get_data_length(packet)); -} - -/** - * Some NICs can receive multiple packets during single interrupt. These can + data, size); +} + +/** + * Some NICs can receive multiple frames during single interrupt. These can * send them in whole list of frames (actually nic_frame_t structures), then - * the list is deallocated and each packet is passed to the + * the list is deallocated and each frame is passed to the * nic_received_packet function. * @@ -1315,23 +1295,4 @@ } -/** Lock packet for DMA usage - * - * @param packet - * @return physical address of packet - */ -int nic_dma_lock_packet(packet_t *packet, size_t size, void **phys) -{ - return dmamem_map(packet, SIZE2PAGES(size), 0, 0, phys); -} - -/** Unlock packet after DMA usage - * - * @param packet - */ -int nic_dma_unlock_packet(packet_t *packet, size_t size) -{ - return dmamem_unmap(packet, size); -} - /** @} */