diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
| commit | 36318d1929e9437df0402a78ff63a70f78d6a89e (patch) | |
| tree | 38588eaa8b400d7abf384a17e21dea75b104b177 /libmachdev/net.c | |
| parent | eaa21da4ea94937a1bc2157c042a233d524d17ce (diff) | |
| parent | d261675a592f6109826ccbdb07c7f485c4c88683 (diff) | |
Merge branch 'dde-upstream' into dde
Conflicts:
dde_e100/Makefile
dde_e1000/Makefile
dde_ne2k_pci/Makefile
dde_pcnet32/Makefile
dde_rtl8139/Makefile
Diffstat (limited to 'libmachdev/net.c')
| -rw-r--r-- | libmachdev/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmachdev/net.c b/libmachdev/net.c index ed52f0e4..4b4cfe7c 100644 --- a/libmachdev/net.c +++ b/libmachdev/net.c @@ -288,8 +288,8 @@ void if_init_queues(ifp) // IFQ_INIT(&ifp->if_snd); queue_init(&ifp->port_list.if_rcv_port_list); queue_init(&ifp->port_list.if_snd_port_list); - mutex_init(&ifp->if_rcv_port_list_lock); - mutex_init(&ifp->if_snd_port_list_lock); + pthread_mutex_init(&ifp->if_rcv_port_list_lock, NULL); + pthread_mutex_init(&ifp->if_snd_port_list_lock, NULL); } static io_return_t |