Merge updated Ethernet code