Modification of erikh/netlink-remove-address PR

This is a modification of original PR by @erikh (R118)
to keep the netlink codebase more consistent and my OCD
under control :-)