Merge branch 'sa1100'

[linux-2.6] / net / tipc / msg.c

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 782485468fb2a1445a29317643ee66b617fe5099..696a8633df757fe1558e31add35019310de361e2 100644 (file)
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -73,10 +73,10 @@ void tipc_msg_print(struct print_buf *buf, struct tipc_msg *msg, const char *str
                tipc_printf(buf, "NO(%u/%u):",msg_long_msgno(msg),
                            msg_fragm_no(msg));
                break;
-       case DATA_LOW:
-       case DATA_MEDIUM:
-       case DATA_HIGH:
-       case DATA_CRITICAL:
+       case TIPC_LOW_IMPORTANCE:
+       case TIPC_MEDIUM_IMPORTANCE:
+       case TIPC_HIGH_IMPORTANCE:
+       case TIPC_CRITICAL_IMPORTANCE:
                tipc_printf(buf, "DAT%u:", msg_user(msg));
                if (msg_short(msg)) {
                        tipc_printf(buf, "CON:");
@@ -229,10 +229,10 @@ void tipc_msg_print(struct print_buf *buf, struct tipc_msg *msg, const char *str
        switch (usr) {
        case CONN_MANAGER:
        case NAME_DISTRIBUTOR:
-       case DATA_LOW:
-       case DATA_MEDIUM:
-       case DATA_HIGH:
-       case DATA_CRITICAL:
+       case TIPC_LOW_IMPORTANCE:
+       case TIPC_MEDIUM_IMPORTANCE:
+       case TIPC_HIGH_IMPORTANCE:
+       case TIPC_CRITICAL_IMPORTANCE:
                if (msg_short(msg))
                        break;  /* No error */
                switch (msg_errcode(msg)) {