Ignore:
Timestamp:
2010-11-20T17:10:35Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
32eceb4f, 8b3bff5
Parents:
0b4a67a (diff), dd5046dd (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 from lp:~jakub/helenos/net.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/nil/nildummy/nildummy.c

    r0b4a67a r7e1f9b7  
    106106static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall)
    107107{
    108         packet_t packet;
     108        packet_t *packet;
    109109        int rc;
    110110
     
    304304
    305305int nil_received_msg_local(int nil_phone, device_id_t device_id,
    306     packet_t packet, services_t target)
    307 {
    308         packet_t next;
     306    packet_t *packet, services_t target)
     307{
     308        packet_t *next;
    309309
    310310        fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
     
    354354 * @return              EINVAL if the service parameter is not known.
    355355 */
    356 static int nildummy_send_message(device_id_t device_id, packet_t packet,
     356static int nildummy_send_message(device_id_t device_id, packet_t *packet,
    357357    services_t sender)
    358358{
     
    378378{
    379379        measured_string_t *address;
    380         packet_t packet;
     380        packet_t *packet;
    381381        size_t addrlen;
    382382        size_t prefix;
Note: See TracChangeset for help on using the changeset viewer.