Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge git://tipc.cslab.ericsson.net/pub/git/tipc

parents ad12583f 4323add6

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -2536,11 +2536,11 @@ S: Maintained 


TIPC NETWORK LAYER

P:	Per Liden

M:	per.liden@nospam.ericsson.com

M:	per.liden@ericsson.com

P:	Jon Maloy

M:	jon.maloy@nospam.ericsson.com

M:	jon.maloy@ericsson.com

P:	Allan Stephens

M:	allan.stephens@nospam.windriver.com

M:	allan.stephens@windriver.com

L:	tipc-discussion@lists.sourceforge.net

W:	http://tipc.sourceforge.net/

W:	http://tipc.cslab.ericsson.net/

include/linux/if_ether.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
					 * over Ethernet

					 */

#define ETH_P_AOE	0x88A2		/* ATA over Ethernet		*/

#define ETH_P_TIPC	0x88CA		/* TIPC 			*/



/*

 *	Non DIX types. Won't clash for 1500 types.

include/linux/tipc_config.h

+5 −2
Original line number Diff line number Diff line
@@ -168,10 +168,13 @@ 
#define TIPC_MAX_LINK_NAME	60	/* format = Z.C.N:interface-Z.C.N:interface */



/*

 * Link priority limits (range from 0 to # priorities - 1)

 * Link priority limits (min, default, max, media default)

 */



#define TIPC_NUM_LINK_PRI 32

#define TIPC_MIN_LINK_PRI	0

#define TIPC_DEF_LINK_PRI	10

#define TIPC_MAX_LINK_PRI	31

#define TIPC_MEDIA_LINK_PRI	(TIPC_MAX_LINK_PRI + 1)



/*

 * Link tolerance limits (min, default, max), in ms

net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ endif 


source "net/dccp/Kconfig"

source "net/sctp/Kconfig"

source "net/tipc/Kconfig"

source "net/atm/Kconfig"

source "net/bridge/Kconfig"

source "net/8021q/Kconfig"
@@ -159,7 +160,6 @@ source "net/ipx/Kconfig" 
source "drivers/net/appletalk/Kconfig"

source "net/x25/Kconfig"

source "net/lapb/Kconfig"

source "net/tipc/Kconfig"



config NET_DIVERT

	bool "Frame Diverter (EXPERIMENTAL)"

net/tipc/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -8,7 +8,12 @@ menu "TIPC Configuration (EXPERIMENTAL)" 
config TIPC

	tristate "The TIPC Protocol (EXPERIMENTAL)"

	---help---

	  TBD.

	  The Transparent Inter Process Communication (TIPC) protocol is

	  specially designed for intra cluster communication. This protocol

	  originates from Ericsson where it has been used in carrier grade

	  cluster applications for many years.

	

	  For more information about TIPC, see http://tipc.sourceforge.net.



	  This protocol support is also available as a module ( = code which

	  can be inserted in and removed from the running kernel whenever you