diff options
author | David S. Miller <davem@davemloft.net> | 2015-05-04 07:18:27 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-04 07:18:27 +0300 |
commit | 4256af62c44b40ffd1c218ad85fc8fd4234d1736 (patch) | |
tree | 41706da9a6d1c9aeae080848de84c8922e7ec6bb /net | |
parent | 7c9a2eeac9b9caafb806e624fd2b75d30ecaee64 (diff) | |
parent | 3a5a883a8a663b930908cae4abe5ec913b9b2fd2 (diff) | |
download | linux-4256af62c44b40ffd1c218ad85fc8fd4234d1736.tar.xz |
Merge branch 'via-rhine-rework'
Francois Romieu says:
====================
via-rhine rework
The series applies against davem-next as of
9dd3c797496affd699805c8a9d8429ad318c892f ("drivers: net: xgene: fix kbuild
warnings").
Patches #1..#4 avoid holes in the receive ring.
Patch #5 is a small leftover cleanup for #1..#4.
Patches #6 and #7 are fairly simple barrier stuff.
Patch #8 closes some SMP transmit races - not that anyone really
complained about these but it's a bit hard to handwave that they
can be safely ignored. Some testing, especially SMP testing of
course, would be welcome.
. Changes since #2:
- added dma_rmb barrier in vlan related patch 6.
- s/wmb/dma_wmb/ in (*new*) patch 7 of 8.
- added explicit SMP barriers in (*new*) patch 8 of 8.
. Changes since #1:
- turned wmb() into dma_wmb() as suggested by davem and Alexander Duyck
in patch 1 of 6.
- forgot to reset rx_head_desc in rhine_reset_rbufs in patch 4 of 6.
- removed rx_head_desc altogether in (*new*) patch 5 of 6
- remoed some vlan receive uglyness in (*new*) patch 6 of 6.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions