Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/srv/net/tl/udp/udp.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/tl/udp/udp.c

    r37f7cfe ra9b6bec  
    393393        fibril_rwlock_write_unlock(&udp_globals.lock);
    394394        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
    395             (ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0,
    396             (ipcarg_t) fragments);
     395            (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0,
     396            (sysarg_t) fragments);
    397397
    398398        return EOK;
     
    742742
    743743                /* Process the call */
    744                 switch (IPC_GET_METHOD(call)) {
     744                switch (IPC_GET_IMETHOD(call)) {
    745745                case IPC_M_PHONE_HUNGUP:
    746746                        keep_on_going = false;
     
    866866        *answer_count = 0;
    867867
    868         switch (IPC_GET_METHOD(*call)) {
     868        switch (IPC_GET_IMETHOD(*call)) {
    869869        case NET_TL_RECEIVED:
    870870                rc = packet_translate_remote(udp_globals.net_phone, &packet,
     
    913913                 * result.
    914914                 */
    915                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
     915                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
    916916                    (res == EHANGUP))
    917917                        return;
Note: See TracChangeset for help on using the changeset viewer.