Changeset 1a23f6e in mainline for uspace/lib/nic/src/nic_driver.c


Ignore:
Timestamp:
2012-05-04T10:41:44Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
af42a2b
Parents:
6efb4d2 (diff), d21e935c (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/nic/src/nic_driver.c

    r6efb4d2 r1a23f6e  
    624624
    625625/**
    626  * This function is to be used only in the loopback driver. It's workaround
    627  * for the situation when the frame does not contain ethernet address.
    628  * The filtering is therefore not applied here.
    629  *
    630  * @param nic_data
    631  * @param data          Frame data
    632  * @param size          Frame size in bytes
    633  */
    634 void nic_received_noneth_frame(nic_t *nic_data, void *data, size_t size)
    635 {
    636         fibril_rwlock_write_lock(&nic_data->stats_lock);
    637         nic_data->stats.receive_packets++;
    638         nic_data->stats.receive_bytes += size;
    639         fibril_rwlock_write_unlock(&nic_data->stats_lock);
    640        
    641         nic_ev_received(nic_data->client_session, data, size);
    642 }
    643 
    644 /**
    645626 * Some NICs can receive multiple frames during single interrupt. These can
    646627 * send them in whole list of frames (actually nic_frame_t structures), then
Note: See TracChangeset for help on using the changeset viewer.