D33543.id100230.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33543.id100230.diff
View Options

	Index: sys/netinet/in_pcb.h
	===================================================================
	--- sys/netinet/in_pcb.h
	+++ sys/netinet/in_pcb.h
	@@ -506,8 +506,6 @@
	struct inpcb il_inp[]; / (h) */
	};

	-#define INP_LOCK_INIT(inp, d, t) \
	- rw_init_flags(&(inp)->inp_lock, (t), RW_RECURSE \| RW_DUPOK)
	#define INP_LOCK_DESTROY(inp) rw_destroy(&(inp)->inp_lock)
	#define INP_RLOCK(inp) rw_rlock(&(inp)->inp_lock)
	#define INP_WLOCK(inp) rw_wlock(&(inp)->inp_lock)
	Index: sys/netinet/sctp_lock_bsd.h
	===================================================================
	--- sys/netinet/sctp_lock_bsd.h
	+++ sys/netinet/sctp_lock_bsd.h
	@@ -254,6 +254,8 @@
	#define SCTP_INP_LOCK_INIT(_inp) do { \
	mtx_init(&(_inp)->inp_mtx, "sctp-inp", "inp", \
	MTX_DEF \| MTX_DUPOK); \
	+ rw_init_flags(&(inp)->ip_inp.inp.inp_lock, "sctpinp", \
	+ RW_RECURSE \| RW_DUPOK); \
	} while (0)

	#define SCTP_INP_LOCK_DESTROY(_inp) do { \
	Index: sys/netinet/sctp_pcb.c
	===================================================================
	--- sys/netinet/sctp_pcb.c
	+++ sys/netinet/sctp_pcb.c
	@@ -2498,7 +2498,6 @@

	SCTP_INP_INFO_WLOCK();
	SCTP_INP_LOCK_INIT(inp);
	- INP_LOCK_INIT(&inp->ip_inp.inp, "inp", "sctpinp");
	SCTP_INP_READ_INIT(inp);
	SCTP_ASOC_CREATE_LOCK_INIT(inp);
	/* lock the new ep */