Changeset 8e7c9fe in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (2 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -46 +46 @@
 #include <stdlib.h>
 #include <sys/types.h>
+#include <task.h>
 #include "addrobj.h"
 #include "icmp.h"
@@ -296 +297 @@
         
         uint8_t ttl = IPC_GET_ARG3(*icall);
-        int df = IPC_GET_ARG3(*icall);
+        int df = IPC_GET_ARG4(*icall);
         
         ipc_callid_t callid;