aboutsummaryrefslogtreecommitdiff
path: root/include/linux/tipc_config.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:08:16 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:08:16 -0800
commit097916ecafd3bbedbde3ba068522093bf72319b3 (patch)
tree95b8f52826883ccb04086725f0b94186adc1566f /include/linux/tipc_config.h
parent3da38566dfd4b2402b280cb52ffc7c56f1a95b9c (diff)
parent29f8f63272bd286549d1c7f75ad22686191d35d8 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/tipc_config.h')
-rw-r--r--include/linux/tipc_config.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/tipc_config.h b/include/linux/tipc_config.h
index a52c8c64a5a..33a653913d9 100644
--- a/include/linux/tipc_config.h
+++ b/include/linux/tipc_config.h
@@ -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