Changeset b5ba8f6 in mainline for uspace/srv/net/inetsrv/inet_link.c


Ignore:
Timestamp:
2013-09-13T13:11:53Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1eaa3cf
Parents:
95027b5 (diff), 1c5f6f8 (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/inetsrv/inet_link.c

    r95027b5 rb5ba8f6  
    235235        inet_addrobj_t *addr = NULL;
    236236       
     237        /* XXX FIXME Cannot rely on loopback being the first IP link service!! */
    237238        if (first_link) {
    238239                addr = inet_addrobj_new();
     
    240241                inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
    241242                first_link = false;
    242         } else {
    243                 /*
    244                  * FIXME
    245                  * Setting static IPv4 address for testing purposes:
    246                  * 10.0.2.15/24
    247                  */
    248                 addr = inet_addrobj_new();
    249                
    250                 inet_naddr(&addr->naddr, 10, 0, 2, 15, 24);
    251243        }
    252244       
Note: See TracChangeset for help on using the changeset viewer.