Changeset cf2af94 in mainline for uspace/srv/net/cfg/ne2k


Ignore:
Timestamp:
2011-02-09T11:46:47Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb15135a
Parents:
a49c4002 (diff), 0b37882 (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

Local modifications:

  • change pipefs and ext2 to build again (use async_* calls instead of ipc_*)
File:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/cfg/ne2k

    ra49c4002 rcf2af94  
    33NAME=ne2k
    44
    5 NETIF=dp8390
     5NETIF=ne2000
    66NIL=eth
    77IL=ip
    88
    9 IRQ=9
     9IRQ=5
    1010IO=300
    1111
    … …  
    1717IP_ADDR=10.0.2.15
    1818IP_ROUTING=yes
    19 IP_NETMASK=255.255.255.240
     19IP_NETMASK=255.255.255.0
    2020IP_BROADCAST=10.0.2.255
    2121IP_GATEWAY=10.0.2.2
    2222ARP=arp
    2323
    24 MTU=1492
     24MTU=1500
Note: See TracChangeset for help on using the changeset viewer.