From: David S. Miller Date: Wed, 10 Apr 2019 19:29:37 +0000 (-0700) Subject: Merge branch 'ibmvnic-features' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f4a58857151f5d0a885fcebb47f6fb1b17dfda9a;p=linux.git Merge branch 'ibmvnic-features' Thomas Falcon says: ==================== ibmvnic: Fix netdev features settings on reset In its current state, a driver reset clobbers any feature settings a user may have toggled and will disable GRO as it is not explicitly enabled in the driver. This patch set enables GRO and tries to retain user settings after a reset. If the underlying carrier changes, however, the driver will disable features unsupported by the new carrier. ==================== Signed-off-by: David S. Miller --- f4a58857151f5d0a885fcebb47f6fb1b17dfda9a