lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
David S. Miller
2006-01-18 14:23:54 -08:00
parent ad12583f46 4323add677
commit 27a7b0415f
49 changed files with 1702 additions and 1705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/if_ether.h
View File

@ -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.

7
include/linux/tipc_config.h
View File

@ -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