Ignore:
Timestamp:
2010-03-24T18:54:50Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
eaf22d4
Parents:
63f8966 (diff), 3db8889 (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:~lukasmejdrech/helenos/network.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/structures/packet/packet_server.c

    r63f8966 r40e29f5  
    194194                        }
    195195                        *answer_count = 2;
    196                         IPC_SET_ARG1(*answer, packet->packet_id);
    197                         IPC_SET_ARG2(*answer, packet->length);
     196                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
     197                        IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
    198198                        return EOK;
    199199                case NET_PACKET_CREATE_4:
     
    203203                        }
    204204                        *answer_count = 2;
    205                         IPC_SET_ARG1(*answer, packet->packet_id);
    206                         IPC_SET_ARG2(*answer, packet->length);
     205                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
     206                        IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
    207207                        return EOK;
    208208                case NET_PACKET_GET:
     
    217217                                return ENOENT;
    218218                        }
    219                         IPC_SET_ARG1(*answer, packet->length);
     219                        IPC_SET_ARG1(*answer, (ipcarg_t) packet->length);
    220220                        *answer_count = 1;
    221221                        return EOK;
Note: See TracChangeset for help on using the changeset viewer.