aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2011-02-27 14:43:52 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-03-13 16:35:17 -0400
commite7b3acb6a85266dfd3e102b3d15b51b0ecd6bc2e (patch)
treed5ed172cc553ae9c9be9f0033b0f0ebe6e68a63b
parent34e46258cb9f53b41e8ffd2e9acd58e0cf64b158 (diff)
tipc: Eliminate timestamp from link protocol messages
Removes support for the timestamp field of TIPC's link protocol messages. This field was previously used to hold an OS-dependent timestamp value that was used to assist in debugging early versions of TIPC. The field has now been deemed unnecessary and has been removed from the latest TIPC specification. This change has no impact on the operation of TIPC since the field was set by TIPC, but never referenced. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--net/tipc/link.c1
-rw-r--r--net/tipc/msg.c1
-rw-r--r--net/tipc/msg.h10
3 files changed, 0 insertions, 12 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 89fbb6d6e95..d4f2780ff87 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1977,7 +1977,6 @@ void tipc_link_send_proto_msg(struct link *l_ptr, u32 msg_typ, int probe_msg,
1977 skb_copy_to_linear_data(buf, msg, sizeof(l_ptr->proto_msg)); 1977 skb_copy_to_linear_data(buf, msg, sizeof(l_ptr->proto_msg));
1978 return; 1978 return;
1979 } 1979 }
1980 msg_set_timestamp(msg, jiffies_to_msecs(jiffies));
1981 1980
1982 /* Message can be sent */ 1981 /* Message can be sent */
1983 1982
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 0787e12423b..b694c9acadc 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -238,7 +238,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)
238 tipc_printf(buf, "REROUTED(%u):", msg_reroute_cnt(msg)); 238 tipc_printf(buf, "REROUTED(%u):", msg_reroute_cnt(msg));
239 break; 239 break;
240 case LINK_PROTOCOL: 240 case LINK_PROTOCOL:
241 tipc_printf(buf, "PROT:TIM(%u):", msg_timestamp(msg));
242 switch (msg_type(msg)) { 241 switch (msg_type(msg)) {
243 case STATE_MSG: 242 case STATE_MSG:
244 tipc_printf(buf, "STATE:"); 243 tipc_printf(buf, "STATE:");
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 9d643a1b7d2..6948d3dbab0 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -438,16 +438,6 @@ static inline void msg_set_nametype(struct tipc_msg *m, u32 n)
438 msg_set_word(m, 8, n); 438 msg_set_word(m, 8, n);
439} 439}
440 440
441static inline void msg_set_timestamp(struct tipc_msg *m, u32 n)
442{
443 msg_set_word(m, 8, n);
444}
445
446static inline u32 msg_timestamp(struct tipc_msg *m)
447{
448 return msg_word(m, 8);
449}
450
451static inline u32 msg_nameinst(struct tipc_msg *m) 441static inline u32 msg_nameinst(struct tipc_msg *m)
452{ 442{
453 return msg_word(m, 9); 443 return msg_word(m, 9);