Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

[linux-2.6] / include / linux / tipc_config.h

diff --git a/include/linux/tipc_config.h b/include/linux/tipc_config.h
index 6e5a3af0d2126cd742a37dc6b7882c75d4c44e48..33a653913d942fa35c263edf1d019f36f4e0f5b1 100644 (file)
--- a/include/linux/tipc_config.h
+++ b/include/linux/tipc_config.h
@@ -1,9 +1,8 @@
 /*
  * include/linux/tipc_config.h: Include file for TIPC configuration interface
  * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -169,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