net: bcmgenet: correct bad merge