Merge branch 'bnxt_en-fixes'