split npe ethernet and hss patch, sync with upstream