Changeset 6773ff3 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2012-04-23T14:57:42Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ee3b6150

Parents:

728d771 (diff), 6aae539d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/lib/nic/src/nic_driver.c (modified) (1 diff)

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