redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[TIPC]: Removal of message header option code 

This patch removes code associated with optional, user-specified
fields of the TIPC message header.  Such fields were never
utilized by TIPC, and have now been removed from the protocol
specification.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
wifi-calibration
Allan Stephens 2008-03-06 15:05:07 -08:00 committed by David S. Miller
parent f59d43899e
commit 8c8696553a
4 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/tipc/tipc_port.h
View File

@ -86,13 +86,6 @@ u32 tipc_createport_raw(void *usr_handle,
void (*wakeup)(struct tipc_port *),
const u32 importance);
/*
* tipc_set_msg_option(): port must be locked.
*/
int tipc_set_msg_option(struct tipc_port *tp_ptr,
const char *opt,
const u32 len);
int tipc_reject_msg(struct sk_buff *buf, u32 err);
int tipc_send_buf_fast(struct sk_buff *buf, u32 destnode);

1
net/tipc/core.c
View File

@ -277,7 +277,6 @@ EXPORT_SYMBOL(tipc_register_media);
/* TIPC API for external APIs (see tipc_port.h) */
EXPORT_SYMBOL(tipc_createport_raw);
EXPORT_SYMBOL(tipc_set_msg_option);
EXPORT_SYMBOL(tipc_reject_msg);
EXPORT_SYMBOL(tipc_send_buf_fast);
EXPORT_SYMBOL(tipc_acknowledge);

23
net/tipc/msg.h
View File

@ -190,18 +190,6 @@ static inline void msg_set_lookup_scope(struct tipc_msg *m, u32 n)
msg_set_bits(m, 1, 19, 0x3, n);
}
static inline void msg_set_options(struct tipc_msg *m, const char *opt, u32 sz)
{
u32 hsz = msg_hdr_sz(m);
char *to = (char *)&m->hdr[hsz/4];
if ((hsz < DIR_MSG_H_SIZE) || ((hsz + sz) > MAX_H_SIZE))
return;
msg_set_bits(m, 1, 16, 0x7, (hsz - 28)/4);
msg_set_hdr_sz(m, hsz + sz);
memcpy(to, opt, sz);
}
static inline u32 msg_bcast_ack(struct tipc_msg *m)
{
return msg_bits(m, 1, 0, 0xffff);
@ -330,17 +318,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m)
return (struct tipc_msg *)msg_data(m);
}
static inline void msg_expand(struct tipc_msg *m, u32 destnode)
{
if (!msg_short(m))
return;
msg_set_hdr_sz(m, LONG_H_SIZE);
msg_set_orignode(m, msg_prevnode(m));
msg_set_destnode(m, destnode);
memset(&m->hdr[8], 0, 12);
}
/*
TIPC internal message header format, version 2

7
net/tipc/port.c
View File

@ -413,13 +413,6 @@ static struct sk_buff *port_build_proto_msg(u32 destport, u32 destnode,
return buf;
}
int tipc_set_msg_option(struct tipc_port *tp_ptr, const char *opt, const u32 sz)
{
msg_expand(&tp_ptr->phdr, msg_destnode(&tp_ptr->phdr));
msg_set_options(&tp_ptr->phdr, opt, sz);
return TIPC_OK;
}
int tipc_reject_msg(struct sk_buff *buf, u32 err)
{
struct tipc_msg *msg = buf_msg(buf);