Commit c7b67aef authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents dafcc438 2537af9d

Documentation/sysctl/net.txt

+16 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Table : Subdirectories in /proc/sys/net 
 ipv4      IP version 4        x25        X.25 protocol

 ipx       IPX                 token-ring IBM token ring

 bridge    Bridging            decnet     DEC net

 ipv6      IP version 6

 ipv6      IP version 6        tipc       TIPC

..............................................................................



1. /proc/sys/net/core - Network core options
@@ -207,3 +207,18 @@ IPX. 
The /proc/net/ipx_route  table  holds  a list of IPX routes. For each route it

gives the  destination  network, the router node (or Directly) and the network

address of the router (or Connected) for internal networks.



6. TIPC

-------------------------------------------------------



The TIPC protocol now has a tunable for the receive memory, similar to the

tcp_rmem - i.e. a vector of 3 INTEGERs: (min, default, max)



    # cat /proc/sys/net/tipc/tipc_rmem

    4252725 34021800        68043600

    #



The max value is set to CONN_OVERLOAD_LIMIT, and the default and min values

are scaled (shifted) versions of that same value.  Note that the min value

is not at this point in time used in any meaningful way, but the triplet is

preserved in order to be consistent with things like tcp_rmem.

include/uapi/linux/tipc.h

+1 −1
Original line number Diff line number Diff line 
/*

 * include/linux/tipc.h: Include file for TIPC socket interface

 * include/uapi/linux/tipc.h: Header for TIPC socket interface

 *

 * Copyright (c) 2003-2006, Ericsson AB

 * Copyright (c) 2005, 2010-2011, Wind River Systems

include/uapi/linux/tipc_config.h

+1 −1
Original line number Diff line number Diff line 
/*

 * include/linux/tipc_config.h: Include file for TIPC configuration interface

 * include/uapi/linux/tipc_config.h: Header for TIPC configuration interface

 *

 * Copyright (c) 2003-2006, Ericsson AB

 * Copyright (c) 2005-2007, 2010-2011, Wind River Systems

net/tipc/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ tipc-y += addr.o bcast.o bearer.o config.o \ 
	   core.o handler.o link.o discover.o msg.o  \

	   name_distr.o  subscr.o name_table.o net.o  \

	   netlink.o node.o node_subscr.o port.o ref.o  \

	   socket.o log.o eth_media.o

	   socket.o log.o eth_media.o server.o



tipc-$(CONFIG_TIPC_MEDIA_IB)	+= ib_media.o

tipc-$(CONFIG_SYSCTL)		+= sysctl.o

net/tipc/bcast.c

+1 −2
Original line number Diff line number Diff line
@@ -578,8 +578,7 @@ u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr) 
 * Returns 0 (packet sent successfully) under all circumstances,

 * since the broadcast link's pseudo-bearer never blocks

 */

static int tipc_bcbearer_send(struct sk_buff *buf,

			      struct tipc_bearer *unused1,

static int tipc_bcbearer_send(struct sk_buff *buf, struct tipc_bearer *unused1,

			      struct tipc_media_addr *unused2)

{

	int bp_index;

CRA Git | Maintained and supported by SUSTech CRA and CCSE