]> 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)
commit7f91368de10b8246f6be8795fce3e8a20d3cdc7e
treeb5ef2ec4c4d1ce8684000222739f1eb8354db927
parentead97ed4c070edbb279e676c137399ae7bbbfaaa
parent2d7b0d54d812b508b1b643628f87eee539444ffd
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>