Changeset f2962621 in mainline for uspace/srv/net/tl/icmp/icmp.c

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (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 with usb/development

File:

• uspace/srv/net/tl/icmp/icmp.c (modified) (4 diffs)

uspace/srv/net/tl/icmp/icmp.c

@@ -693 +693 @@
         int rc;
 
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case NET_ICMP_DEST_UNREACH:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
@@ -824 +824 @@
 
                 /* Process the call */
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         keep_on_going = false;
@@ -900 +900 @@
 
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case NET_TL_RECEIVED:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
@@ -953 +953 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;