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

Changeset 5863a95 in mainline for uspace/srv/net/il/arp/arp.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/il/arp/arp.c

    r70e5ad5 r5863a95  
    320320                /* Bind the new one */
    321321                device->phone = nil_bind_service(device->service,
    322                     (ipcarg_t) device->device_id, SERVICE_ARP,
     322                    (sysarg_t) device->device_id, SERVICE_ARP,
    323323                    arp_globals.client_connection);
    324324                if (device->phone < 0) {
     
    695695       
    696696        *answer_count = 0;
    697         switch (IPC_GET_METHOD(*call)) {
     697        switch (IPC_GET_IMETHOD(*call)) {
    698698        case IPC_M_PHONE_HUNGUP:
    699699                return EOK;
     
    815815                 * result.
    816816                 */
    817                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
     817                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
    818818                    (res == EHANGUP))
    819819                        return;
Note: See TracChangeset for help on using the changeset viewer.