Changeset 65d7b0a in mainline

Timestamp:

2011-12-18T09:58:06Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1440eae

Parents:

9fe4db3 (diff), 1761268 (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 mainline

Files:

• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)
• uspace/lib/net/generic/packet_remote.c (modified) (1 diff)
• uspace/srv/net/net/packet_server.c (modified) (2 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -278 +278 @@
                 }
         } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_SHARE_IN) {
-                if (!IPC_GET_RETVAL(answer->data)) { 
+                if (!IPC_GET_RETVAL(answer->data)) {
                         irq_spinlock_lock(&answer->sender->lock, true);
                         as_t *as = answer->sender->as;

uspace/lib/net/generic/packet_remote.c

@@ -77 +77 @@
         async_wait_for(message, &result);
         
-        if (rc != EOK) {
-                munmap(*packet, size);
+        if (rc != EOK)
                 return rc;
-        }
         
         rc = pm_add(*packet);

uspace/srv/net/net/packet_server.c

@@ -304 +304 @@
 static int packet_reply(packet_t *packet)
 {
+        if (!packet_is_valid(packet))
+                return EINVAL;
+        
         ipc_callid_t callid;
         size_t size;
-
-        if (!packet_is_valid(packet))
-                return EINVAL;
-
         if (!async_share_in_receive(&callid, &size)) {
                 async_answer_0(callid, EINVAL);
                 return EINVAL;
         }
-
+        
         if (size != packet->length) {
                 async_answer_0(callid, ENOMEM);
@@ -375 +374 @@
         case NET_PACKET_GET:
                 packet = pm_find(IPC_GET_ID(*call));
-                if (!packet_is_valid(packet)) {
+                if (!packet_is_valid(packet))
                         return ENOENT;
-                }
+                
                 return packet_reply(packet);