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

Changeset 520acaf in mainline for uspace/srv/net/tcp/sock.c


Ignore:
Timestamp:
2012-06-06T21:13:29Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
5f679702
Parents:
11b9ad7 (diff), 3123d2a (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/tcp/sock.c

    r11b9ad7 r520acaf  
    6868int tcp_sock_init(void)
    6969{
    70         int rc;
    71 
    7270        socket_ports_initialize(&gsock);
    73 
     71       
    7472        async_set_client_connection(tcp_sock_connection);
    75 
    76         rc = service_register(SERVICE_TCP);
     73       
     74        int rc = service_register(SERVICE_TCP);
    7775        if (rc != EOK)
    7876                return EEXIST;
    79 
     77       
    8078        return EOK;
    8179}
Note: See TracChangeset for help on using the changeset viewer.