Merge branch 'stmmac-eee'

Browse source

Giuseppe Cavallaro says:

====================
stmmac EEE fixes

This is a subset of patches to provide some fixes for the EEE support inside the
driver.
Patches have been tested on boards EEE capable plugged on switch w/ w/o EEE
support.
====================

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

...

This commit is contained in:

David S. Miller 2014-08-31 22:01:22 -07:00

parent 38ab1fa981 71965352ee

commit 2bb71b6964

2 changed files with 13 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/net/ethernet/stmicro/stmmac/common.h

View file

12

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

View file