Changeset ca2d142 in mainline for uspace/srv/net/netif/dp8390/dp8390.c

Timestamp:

2010-02-18T10:00:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e326edc

Parents:

b8da2a3 (diff), 91478aa (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 from the networking branch.

File:

• uspace/srv/net/netif/dp8390/dp8390.c (modified) (3 diffs)

uspace/srv/net/netif/dp8390/dp8390.c

@@ -350 +350 @@
                 tmp = pq_next( tmp );
         }
-        if( ! pq_add( tmp, packet, 0, 0 )){
+        if( pq_add( & tmp, packet, 0, 0 ) != EOK ){
                 return EINVAL;
         }
@@ -1006 +1006 @@
         int last, count;
         packet_t        packet;
-        packet_t        queue;
 
 //      if (!(dep->de_flags & DEF_READING))
@@ -1045 +1044 @@
                 return ELIMIT;
         }else{
-                queue = pq_add( dep->received_queue, packet, 0, 0 );
-                if( queue ){
-                        dep->received_queue = queue;
+                if( pq_add( & dep->received_queue, packet, 0, 0 ) == EOK ){
                         ++ dep->received_count;
                 }else{