| commit | e95c3edaaa4547387b36fbe13f27fa8cd788ebbc | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Feb 01 16:57:05 2014 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Sat Feb 01 16:57:05 2014 -0800 |
| tree | b5ef2ec4c4d1ce8684000222739f1eb8354db927 | |
| parent | 65b80cae7a72e94df9335552e1a77a3a8946566c [diff] | |
| parent | bee7bacd18612564b85dc0b3e54063316c5bb32d [diff] |
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>