[PATCH 0/2 net-next]: fixups for wrong conflict resolution

Hello David,

here are our two fixes to recover from the little problems introduced during the
last conflict resolution involving translation-table.c.
Sorry for the inconvenient.

Thank you,
	Antonio