]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ethoc'
authorDavid S. Miller <davem@davemloft.net>
Sun, 2 Feb 2014 00:57:05 +0000 (16:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 2 Feb 2014 00:57:05 +0000 (16:57 -0800)
commit78260fcf59cb7f35e8bb80f1d692e21e20065a34
treeb5ef2ec4c4d1ce8684000222739f1eb8354db927
parenta46e8373e87a9867f5842388e6f7732b4a1a479a
parentc26745a5fabf24fb5fd6dae2bcb636e644f5d735
Merge branch 'ethoc'

Max Filippov says:

====================
OpenCores 10/100 MAC ethtool operations

this series implements ethtool callbacks for the ethoc driver as was
requested by Florian.

Changes v1->v2:
- fix {get,set}_settings return code in case there's no PHY;
- fix set_ringparam: check ring sizes, change ring sizes on the fly.
====================

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