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

Changeset a9b6bec in mainline for uspace/srv/net/net/net.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/net/net.c

    r37f7cfe ra9b6bec  
    322322static int net_module_start(async_client_conn_t client_connection)
    323323{
    324         ipcarg_t phonehash;
     324        sysarg_t phonehash;
    325325        int rc;
    326326       
     
    632632       
    633633        *answer_count = 0;
    634         switch (IPC_GET_METHOD(*call)) {
     634        switch (IPC_GET_IMETHOD(*call)) {
    635635        case IPC_M_PHONE_HUNGUP:
    636636                return EOK;
     
    697697               
    698698                /* End if told to either by the message or the processing result */
    699                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
     699                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
    700700                        return;
    701701               
Note: See TracChangeset for help on using the changeset viewer.