Changeset 7943c43 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/srv/net/nil/eth/eth.c (modified) (1 diff)

uspace/srv/net/nil/eth/eth.c

@@ -802 +802 @@
                         next = tmp;
                 } else {
+                        nic_send_frame(device->sess, packet_get_data(next),
+                            packet_get_data_length(next));
                         next = pq_next(next);
                 }
         } while (next);
         
-        /* Send packet queue */
-        if (packet)
-                nic_send_message(device->sess, packet_get_id(packet));
+        pq_release_remote(eth_globals.net_sess, packet_get_id(packet));
         
         fibril_rwlock_read_unlock(&eth_globals.devices_lock);