diff options
Diffstat (limited to 'net/tipc/msg.h')
-rw-r--r-- | net/tipc/msg.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index eba524e34a6..ba2a72beea6 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h | |||
@@ -44,7 +44,6 @@ | |||
44 | * | 44 | * |
45 | * Note: Some items are also used with TIPC internal message headers | 45 | * Note: Some items are also used with TIPC internal message headers |
46 | */ | 46 | */ |
47 | |||
48 | #define TIPC_VERSION 2 | 47 | #define TIPC_VERSION 2 |
49 | 48 | ||
50 | /* | 49 | /* |
@@ -58,7 +57,6 @@ | |||
58 | /* | 57 | /* |
59 | * Payload message types | 58 | * Payload message types |
60 | */ | 59 | */ |
61 | |||
62 | #define TIPC_CONN_MSG 0 | 60 | #define TIPC_CONN_MSG 0 |
63 | #define TIPC_MCAST_MSG 1 | 61 | #define TIPC_MCAST_MSG 1 |
64 | #define TIPC_NAMED_MSG 2 | 62 | #define TIPC_NAMED_MSG 2 |
@@ -67,7 +65,6 @@ | |||
67 | /* | 65 | /* |
68 | * Message header sizes | 66 | * Message header sizes |
69 | */ | 67 | */ |
70 | |||
71 | #define SHORT_H_SIZE 24 /* In-cluster basic payload message */ | 68 | #define SHORT_H_SIZE 24 /* In-cluster basic payload message */ |
72 | #define BASIC_H_SIZE 32 /* Basic payload message */ | 69 | #define BASIC_H_SIZE 32 /* Basic payload message */ |
73 | #define NAMED_H_SIZE 40 /* Named payload message */ | 70 | #define NAMED_H_SIZE 40 /* Named payload message */ |
@@ -121,7 +118,6 @@ static inline void msg_swap_words(struct tipc_msg *msg, u32 a, u32 b) | |||
121 | /* | 118 | /* |
122 | * Word 0 | 119 | * Word 0 |
123 | */ | 120 | */ |
124 | |||
125 | static inline u32 msg_version(struct tipc_msg *m) | 121 | static inline u32 msg_version(struct tipc_msg *m) |
126 | { | 122 | { |
127 | return msg_bits(m, 0, 29, 7); | 123 | return msg_bits(m, 0, 29, 7); |
@@ -216,7 +212,6 @@ static inline void msg_set_size(struct tipc_msg *m, u32 sz) | |||
216 | /* | 212 | /* |
217 | * Word 1 | 213 | * Word 1 |
218 | */ | 214 | */ |
219 | |||
220 | static inline u32 msg_type(struct tipc_msg *m) | 215 | static inline u32 msg_type(struct tipc_msg *m) |
221 | { | 216 | { |
222 | return msg_bits(m, 1, 29, 0x7); | 217 | return msg_bits(m, 1, 29, 0x7); |
@@ -291,7 +286,6 @@ static inline void msg_set_bcast_ack(struct tipc_msg *m, u32 n) | |||
291 | /* | 286 | /* |
292 | * Word 2 | 287 | * Word 2 |
293 | */ | 288 | */ |
294 | |||
295 | static inline u32 msg_ack(struct tipc_msg *m) | 289 | static inline u32 msg_ack(struct tipc_msg *m) |
296 | { | 290 | { |
297 | return msg_bits(m, 2, 16, 0xffff); | 291 | return msg_bits(m, 2, 16, 0xffff); |
@@ -315,8 +309,6 @@ static inline void msg_set_seqno(struct tipc_msg *m, u32 n) | |||
315 | /* | 309 | /* |
316 | * Words 3-10 | 310 | * Words 3-10 |
317 | */ | 311 | */ |
318 | |||
319 | |||
320 | static inline u32 msg_prevnode(struct tipc_msg *m) | 312 | static inline u32 msg_prevnode(struct tipc_msg *m) |
321 | { | 313 | { |
322 | return msg_word(m, 3); | 314 | return msg_word(m, 3); |
@@ -434,7 +426,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) | |||
434 | return (struct tipc_msg *)msg_data(m); | 426 | return (struct tipc_msg *)msg_data(m); |
435 | } | 427 | } |
436 | 428 | ||
437 | |||
438 | /* | 429 | /* |
439 | * Constants and routines used to read and write TIPC internal message headers | 430 | * Constants and routines used to read and write TIPC internal message headers |
440 | */ | 431 | */ |
@@ -442,7 +433,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) | |||
442 | /* | 433 | /* |
443 | * Internal message users | 434 | * Internal message users |
444 | */ | 435 | */ |
445 | |||
446 | #define BCAST_PROTOCOL 5 | 436 | #define BCAST_PROTOCOL 5 |
447 | #define MSG_BUNDLER 6 | 437 | #define MSG_BUNDLER 6 |
448 | #define LINK_PROTOCOL 7 | 438 | #define LINK_PROTOCOL 7 |
@@ -456,7 +446,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) | |||
456 | /* | 446 | /* |
457 | * Connection management protocol message types | 447 | * Connection management protocol message types |
458 | */ | 448 | */ |
459 | |||
460 | #define CONN_PROBE 0 | 449 | #define CONN_PROBE 0 |
461 | #define CONN_PROBE_REPLY 1 | 450 | #define CONN_PROBE_REPLY 1 |
462 | #define CONN_ACK 2 | 451 | #define CONN_ACK 2 |
@@ -464,14 +453,12 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) | |||
464 | /* | 453 | /* |
465 | * Name distributor message types | 454 | * Name distributor message types |
466 | */ | 455 | */ |
467 | |||
468 | #define PUBLICATION 0 | 456 | #define PUBLICATION 0 |
469 | #define WITHDRAWAL 1 | 457 | #define WITHDRAWAL 1 |
470 | 458 | ||
471 | /* | 459 | /* |
472 | * Segmentation message types | 460 | * Segmentation message types |
473 | */ | 461 | */ |
474 | |||
475 | #define FIRST_FRAGMENT 0 | 462 | #define FIRST_FRAGMENT 0 |
476 | #define FRAGMENT 1 | 463 | #define FRAGMENT 1 |
477 | #define LAST_FRAGMENT 2 | 464 | #define LAST_FRAGMENT 2 |
@@ -479,7 +466,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) | |||
479 | /* | 466 | /* |
480 | * Link management protocol message types | 467 | * Link management protocol message types |
481 | */ | 468 | */ |
482 | |||
483 | #define STATE_MSG 0 | 469 | #define STATE_MSG 0 |
484 | #define RESET_MSG 1 | 470 | #define RESET_MSG 1 |
485 | #define ACTIVATE_MSG 2 | 471 | #define ACTIVATE_MSG 2 |
@@ -493,7 +479,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) | |||
493 | /* | 479 | /* |
494 | * Config protocol message types | 480 | * Config protocol message types |
495 | */ | 481 | */ |
496 | |||
497 | #define DSC_REQ_MSG 0 | 482 | #define DSC_REQ_MSG 0 |
498 | #define DSC_RESP_MSG 1 | 483 | #define DSC_RESP_MSG 1 |
499 | 484 | ||
@@ -501,7 +486,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) | |||
501 | /* | 486 | /* |
502 | * Word 1 | 487 | * Word 1 |
503 | */ | 488 | */ |
504 | |||
505 | static inline u32 msg_seq_gap(struct tipc_msg *m) | 489 | static inline u32 msg_seq_gap(struct tipc_msg *m) |
506 | { | 490 | { |
507 | return msg_bits(m, 1, 16, 0x1fff); | 491 | return msg_bits(m, 1, 16, 0x1fff); |
@@ -526,7 +510,6 @@ static inline void msg_set_node_sig(struct tipc_msg *m, u32 n) | |||
526 | /* | 510 | /* |
527 | * Word 2 | 511 | * Word 2 |
528 | */ | 512 | */ |
529 | |||
530 | static inline u32 msg_dest_domain(struct tipc_msg *m) | 513 | static inline u32 msg_dest_domain(struct tipc_msg *m) |
531 | { | 514 | { |
532 | return msg_word(m, 2); | 515 | return msg_word(m, 2); |
@@ -561,7 +544,6 @@ static inline void msg_set_bcgap_to(struct tipc_msg *m, u32 n) | |||
561 | /* | 544 | /* |
562 | * Word 4 | 545 | * Word 4 |
563 | */ | 546 | */ |
564 | |||
565 | static inline u32 msg_last_bcast(struct tipc_msg *m) | 547 | static inline u32 msg_last_bcast(struct tipc_msg *m) |
566 | { | 548 | { |
567 | return msg_bits(m, 4, 16, 0xffff); | 549 | return msg_bits(m, 4, 16, 0xffff); |
@@ -628,7 +610,6 @@ static inline void msg_set_link_selector(struct tipc_msg *m, u32 n) | |||
628 | /* | 610 | /* |
629 | * Word 5 | 611 | * Word 5 |
630 | */ | 612 | */ |
631 | |||
632 | static inline u32 msg_session(struct tipc_msg *m) | 613 | static inline u32 msg_session(struct tipc_msg *m) |
633 | { | 614 | { |
634 | return msg_bits(m, 5, 16, 0xffff); | 615 | return msg_bits(m, 5, 16, 0xffff); |
@@ -697,7 +678,6 @@ static inline char *msg_media_addr(struct tipc_msg *m) | |||
697 | /* | 678 | /* |
698 | * Word 9 | 679 | * Word 9 |
699 | */ | 680 | */ |
700 | |||
701 | static inline u32 msg_msgcnt(struct tipc_msg *m) | 681 | static inline u32 msg_msgcnt(struct tipc_msg *m) |
702 | { | 682 | { |
703 | return msg_bits(m, 9, 16, 0xffff); | 683 | return msg_bits(m, 9, 16, 0xffff); |
@@ -744,5 +724,4 @@ void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, | |||
744 | int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect, | 724 | int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect, |
745 | u32 num_sect, unsigned int total_len, | 725 | u32 num_sect, unsigned int total_len, |
746 | int max_size, int usrmem, struct sk_buff **buf); | 726 | int max_size, int usrmem, struct sk_buff **buf); |
747 | |||
748 | #endif | 727 | #endif |