Changeset d7ff048 in mainline for uspace/lib/net/generic/packet_remote.c

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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:

• uspace/lib/net/generic/packet_remote.c (modified) (2 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -115 +115 @@
         
         *packet = pm_find(packet_id);
-        if (!*packet) {
+        if (*packet == NULL) {
                 async_exch_t *exch = async_exchange_begin(sess);
                 sysarg_t size;
@@ -130 +130 @@
         }
         
-        if ((*packet)->next) {
+        if ((*packet != NULL) && ((*packet)->next)) {
                 packet_t *next;
                 return packet_translate_remote(sess, &next, (*packet)->next);