Date: Fri, 17 Jun 2016 16:27:43 GMT From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r305308 - soc2016/vincenzo/head/sys/dev/netmap Message-ID: <201606171627.u5HGRhpF030337@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vincenzo Date: Fri Jun 17 16:27:43 2016 New Revision: 305308 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305308 Log: freebsd: extend hack added by f140085f9da89c5e Modified: soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c soc2016/vincenzo/head/sys/dev/netmap/netmap_mem2.c Modified: soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c ============================================================================== --- soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c Fri Jun 17 16:27:33 2016 (r305307) +++ soc2016/vincenzo/head/sys/dev/netmap/netmap_freebsd.c Fri Jun 17 16:27:43 2016 (r305308) @@ -1451,6 +1451,7 @@ error = EBUSY; break; } + netmap_initialized = 0; netmap_fini(); break; Modified: soc2016/vincenzo/head/sys/dev/netmap/netmap_mem2.c ============================================================================== --- soc2016/vincenzo/head/sys/dev/netmap/netmap_mem2.c Fri Jun 17 16:27:33 2016 (r305307) +++ soc2016/vincenzo/head/sys/dev/netmap/netmap_mem2.c Fri Jun 17 16:27:43 2016 (r305308) @@ -562,9 +562,15 @@ return ret; } +extern int netmap_initialized; + static void nm_mem_release_id(struct netmap_mem_d *nmd) { + if (!netmap_initialized) { + D("skip, nm_mem could be gone"); + return; + } NMA_LOCK(&nm_mem); nmd->prev->next = nmd->next;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606171627.u5HGRhpF030337>