Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd_iflib: Fix usage of kobj_lookup_method. 

Should solve #15441. We should probably enable -Werror=incompatible-ptr
globally to avoid this in the future...
This commit is contained in:
Augustin Cavalier 2019-10-23 21:11:42 -04:00
parent d79013ecaa
commit c903bc728b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/compat/freebsd_iflib/iflib.c
View File

@ -4810,7 +4810,11 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct
* aren't the default NULL implementation. * aren't the default NULL implementation.
*/ */
kobj_desc = &ifdi_rx_queue_intr_enable_desc; kobj_desc = &ifdi_rx_queue_intr_enable_desc;
#ifdef __HAIKU__
kobj_method = kobj_lookup_method(ctx->ops.cls, NULL,
#else
kobj_method = kobj_lookup_method(((kobj_t)ctx), NULL, kobj_method = kobj_lookup_method(((kobj_t)ctx), NULL,
#endif
kobj_desc); kobj_desc);
if (kobj_method == &kobj_desc->deflt) { if (kobj_method == &kobj_desc->deflt) {
device_printf(dev, device_printf(dev,
@ -4819,7 +4823,11 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct
goto fail_queues; goto fail_queues;
} }
kobj_desc = &ifdi_tx_queue_intr_enable_desc; kobj_desc = &ifdi_tx_queue_intr_enable_desc;
#ifdef __HAIKU__
kobj_method = kobj_lookup_method(ctx->ops.cls, NULL,
#else
kobj_method = kobj_lookup_method(((kobj_t)ctx), NULL, kobj_method = kobj_lookup_method(((kobj_t)ctx), NULL,
#endif
kobj_desc); kobj_desc);
if (kobj_method == &kobj_desc->deflt) { if (kobj_method == &kobj_desc->deflt) {
device_printf(dev, device_printf(dev,