More fixes

Change-Id: Ie2a43107249ff85949c59d8f23122fd9feb32b8c

Conflicts:

	include/net/ip.h