Changeset db71e2a in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/lib/nic/src/nic_driver.c (modified) (1 diff)

uspace/lib/nic/src/nic_driver.c

@@ -682 +682 @@
         fibril_rwlock_initialize(&nic_data->wv_lock);
         
-        bzero(&nic_data->mac, sizeof(nic_address_t));
-        bzero(&nic_data->default_mac, sizeof(nic_address_t));
-        bzero(&nic_data->stats, sizeof(nic_device_stats_t));
+        memset(&nic_data->mac, 0, sizeof(nic_address_t));
+        memset(&nic_data->default_mac, 0, sizeof(nic_address_t));
+        memset(&nic_data->stats, 0, sizeof(nic_device_stats_t));
         
         return nic_data;