Partial cherrypick of fix warning: 71bd1986f60670a61949fd7dab5ae4d969557ea7

Conflicts:

	include/net/bluetooth/smp.h
	net/bluetooth/smp.c

Signed-off-by: task650 <task650@gmail.com>