Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2014-07-25
This series contains updates to e1000e, ixgbe and ixgbevf.
Mark provides all the changes for ixgbe and ixgbevf. Converts some udelay()
calls to the preferred usleep_range(). Fixes a spurious release of the
semaphore in several functions when there was a failure to acquire the
semaphore in the first place. Fixes a X540 semaphore error where an
incorrect check was treating success as failure and vice-versa. Fixed
ixgbe_write_mbx() error when it was being called and there was no
mbx->ops.write method defined, so no error code was returned. The
corresponding read function would explicitly return an error in such a
case as do other functions. Cleans up unused (dead) code by removing it.
Finally make return values more direct, eliminating some gotos and
otherwise unneeded conditionals, which allows the removal of some local
variables.
David provides all the changes for e1000e. Fix CRC errors with jumbo
traffic for 82579, i217 and i218 client parts to increase the gap
between the read and write pointers in the transmit FIFO. Added code
to check and respond to previously ignored return values from NVM
access functions. Added support for EEE in Sx states and fixed EEE in
S5 with runtime PM enabled.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>