diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-23 20:47:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-23 20:47:56 -0800 |
| commit | 55ae22d08fc9b531bc8a88b7306004e7053bb425 (patch) | |
| tree | d60dd4970f9bc2fb5ce21571c862d421f4a00402 /net/tipc/msg.h | |
| parent | d12b0d9adc46888e3bb0224886105bf3b188553b (diff) | |
| parent | bf781ecfc6d6ecc4f66762a870f9c1fc76b9c8d5 (diff) | |
Merge branch 'tipc-Feb23-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
Diffstat (limited to 'net/tipc/msg.h')
| -rw-r--r-- | net/tipc/msg.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 92c4c4fd7b3f..9d643a1b7d22 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h @@ -2,7 +2,7 @@ * net/tipc/msg.h: Include file for TIPC message header routines * * Copyright (c) 2000-2007, Ericsson AB - * Copyright (c) 2005-2008, Wind River Systems + * Copyright (c) 2005-2008, 2010-2011, Wind River Systems * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -438,11 +438,6 @@ static inline void msg_set_nametype(struct tipc_msg *m, u32 n) msg_set_word(m, 8, n); } -static inline u32 msg_transp_seqno(struct tipc_msg *m) -{ - return msg_word(m, 8); -} - static inline void msg_set_timestamp(struct tipc_msg *m, u32 n) { msg_set_word(m, 8, n); @@ -453,11 +448,6 @@ static inline u32 msg_timestamp(struct tipc_msg *m) return msg_word(m, 8); } -static inline void msg_set_transp_seqno(struct tipc_msg *m, u32 n) -{ - msg_set_word(m, 8, n); -} - static inline u32 msg_nameinst(struct tipc_msg *m) { return msg_word(m, 9); @@ -577,16 +567,6 @@ static inline void msg_set_seq_gap(struct tipc_msg *m, u32 n) msg_set_bits(m, 1, 16, 0x1fff, n); } -static inline u32 msg_req_links(struct tipc_msg *m) -{ - return msg_bits(m, 1, 16, 0xfff); -} - -static inline void msg_set_req_links(struct tipc_msg *m, u32 n) -{ - msg_set_bits(m, 1, 16, 0xfff, n); -} - /* * Word 2 |