Merge ethtool upstream commit 2941970e0f60fc90b0ef09f20f7fe9a72ab2dc1c
am: 76667b5de3

Change-Id: I6233e6038a3819458206b8e0c46a58d220841a20