Changeset db96017 in mainline for uspace/lib/net/include/nil_skel.h


Ignore:
Timestamp:
2012-04-07T17:41:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b6913b7
Parents:
b69e4c0 (diff), 6bb169b5 (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/net/include/nil_skel.h

    rb69e4c0 rdb96017  
    7070 *
    7171 */
    72 extern int nil_device_state_msg_local(device_id_t device_id, sysarg_t state);
     72extern int nil_device_state_msg_local(nic_device_id_t device_id, sysarg_t state);
    7373
    7474/** Pass the packet queue to the network interface layer.
     
    8181 * @param[in] device_id Source device identifier.
    8282 * @param[in] packet    Received packet or the received packet queue.
    83  * @param[in] target    Target service. Ignored parameter.
    8483 *
    8584 * @return EOK on success.
     
    8887 *
    8988 */
    90 extern int nil_received_msg_local(device_id_t device_id, packet_t *packet,
    91     services_t target);
     89extern int nil_received_msg_local(nic_device_id_t device_id, packet_t *packet);
    9290
    9391/** Message processing function.
Note: See TracChangeset for help on using the changeset viewer.