Changeset 7943c43 in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2012-01-16T22:45:38Z (14 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/drv/nic/ne2k/ne2k.c (modified) (1 diff)

uspace/drv/nic/ne2k/ne2k.c

@@ -343 +343 @@
                 return ENOMEM;
         
-        nic_set_write_packet_handler(nic_data, ne2k_send);
+        nic_set_send_frame_handler(nic_data, ne2k_send);
         nic_set_state_change_handlers(nic_data,
                 ne2k_on_activating, NULL, ne2k_on_stopping);