diff options
author | David S. Miller <davem@davemloft.net> | 2013-06-18 02:53:09 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-18 02:53:09 +0400 |
commit | c7b67aef0fa5f665ca47f45d254e806e919d01ac (patch) | |
tree | 5130503fa11ba0c7ec74174165ba332ed513b88a /drivers/net/ethernet/broadcom | |
parent | dafcc4380deec21d160c31411f33c8813f67f517 (diff) | |
parent | 2537af9dcabbdd6c93c041a955d3a9ae42c0c008 (diff) | |
download | linux-c7b67aef0fa5f665ca47f45d254e806e919d01ac.tar.xz |
Merge branch 'tipc'
Paul Gortmaker says:
====================
This is a rework of the content sent earlier[1], with the following changes:
-drop the Kconfig --> modparam conversion patch; this was
requested to be replaced[2] with a dynamic port quantity resizing.
Ying and Erik were discussing how best to achieve this, and then
vacation schedules got in the way, so implementing that will
come (hopefully) in the next round.
-rework the sk_rcvbuf patch to allow memory resizing via sysctl
as per what Ying and Neil discussed[3]
-add 4 more seemingly straigtforward and relatively small changes
from Ying (the last 4 in the series).
-add cosmetic UAPI comment update patch from Ying.
That said, the largest change is still the one where we make use of
the fact that linux supports kernel threads and do the server like
operations within kernel threads. As Jon says:
We remove the last remnants of the TIPC native API, to make it
possible to simplify locking policy and solve a problem with lost
topology events.
First, we introduce a socket-based alternative to the native API.
Second, we convert the two remaining users of the native API, the
TIPC internal topology server and the configuarion server, to use the
new API.
Third, we remove the remaining code pertaining to the native API.
I have re-tested this collection of commits between 32 and 64 bit x86
machines using the standard tipc test suite, and build tested for ppc.
[1] http://patchwork.ozlabs.org/patch/247687/
[2] http://patchwork.ozlabs.org/patch/247680/
[3] http://patchwork.ozlabs.org/patch/247688/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
0 files changed, 0 insertions, 0 deletions