kernel: sync bgmac changes with latest upstream submission