tree 061b767ccf7d6955cc4fb921c230a787d194392e
parent 06b37b650cf826349677564cb0ff1560ed8e51fc
parent 3b404a519815b9820f73f1ecf404e5546c9270ba
author David S. Miller <davem@davemloft.net> 1479832168 -0500
committer David S. Miller <davem@davemloft.net> 1479839236 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All conflicts were simple overlapping changes except perhaps
for the Thunder driver.

That driver has a change_mtu method explicitly for sending
a message to the hardware.  If that fails it returns an
error.

Normally a driver doesn't need an ndo_change_mtu method becuase those
are usually just range changes, which are now handled generically.
But since this extra operation is needed in the Thunder driver, it has
to stay.

However, if the message send fails we have to restore the original
MTU before the change because the entire call chain expects that if
an error is thrown by ndo_change_mtu then the MTU did not change.
Therefore code is added to nicvf_change_mtu to remember the original
MTU, and to restore it upon nicvf_update_hw_max_frs() failue.

Signed-off-by: David S. Miller <davem@davemloft.net>