Changeset a5c82bb9 in mainline

Timestamp:

2012-04-22T21:50:29Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f7cbc6f

Parents:

d3a8e47

Message:

NIC no longer needs to support non-Ethernet frames.

Location:

uspace/lib/nic

Files:

• include/nic.h (modified) (1 diff)
• src/nic_driver.c (modified) (1 diff)

uspace/lib/nic/include/nic.h

@@ -232 +232 @@
 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_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 *);

uspace/lib/nic/src/nic_driver.c

@@ -624 +624 @@
 
 /**
- * This function is to be used only in the loopback driver. It's workaround
- * for the situation when the frame does not contain ethernet address.
- * The filtering is therefore not applied here.
- *
- * @param nic_data
- * @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 += size;
-        fibril_rwlock_write_unlock(&nic_data->stats_lock);
-        
-        nic_ev_received(nic_data->client_session, 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