diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-25 13:08:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-25 13:08:36 -0400 |
commit | c9e19ea421ac2fcbea869cd79e17446cecf89c95 (patch) | |
tree | f93b8455ab7626c43d9e266ade6bf907fa733045 /mm/slab_common.c | |
parent | 26d732baa09daa196b426b6cb354783eb1c75ec5 (diff) | |
parent | ca84dfb9ab70849c2b01f30d658a8900cff9889d (diff) |
Merge branch 'stmmac-rework-speed-selection'
Corentin Labbe says:
====================
net-next: stmmac: rework the speed selection
The current stmmac_adjust_link() part which handle speed have
some if (has_platform) code and my dwmac-sun8i will add more of them.
So we need to handle better speed selection.
Moreover the struct link member speed and port are hard to guess their
purpose. And their unique usage are to be combined for writing speed.
My first try was to create an adjust_link() in stmmac_ops but it duplicate some code
The current solution is to have direct value for 10/100/1000 and a mask for them.
The first 4 patchs fix some minor problem found in stmmac_adjust_link() and reported by Florian Fainelli in my previous serie.
The last patch is the real work.
This series is tested on cubieboard2 (dwmac1000) and opipc (dwmac-sun8i).
Changes since v3:
- Added the patch #4 "Convert old_link to bool" as suggested by Joe Perches
- Changed the speedmask
Changes since v2:
- Use true/false for new_state in patch #1
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/slab_common.c')
0 files changed, 0 insertions, 0 deletions