]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 65b80ca bee7bac)
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)
commite95c3edaaa4547387b36fbe13f27fa8cd788ebbc
treeb5ef2ec4c4d1ce8684000222739f1eb8354db927tree | snapshot
parent65b80cae7a72e94df9335552e1a77a3a8946566ccommit | diff
parentbee7bacd18612564b85dc0b3e54063316c5bb32dcommit | 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>
Andy's Linux Kernel repo