openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tipc: eliminate two pseudo message types of BUNDLE_OPEN and BUNDLE_CLOSED 

The pseudo message types of BUNDLE_CLOSED as well as BUNDLE_OPEN are
used to flag whether or not more messages can be bundled into a data
packet in the outgoing transmission queue. Obviously, no more messages
can be appended after the packet has been sent and is waiting to be
acknowledged and deleted. These message types do in reality represent
a send-side local implementation flag, and are not defined as part of
the protocol. It is therefore safe to move it to to where it belongs,
that is, the control area (TIPC_SKB_CB) of the buffer.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue 2014-11-26 11:41:49 +08:00 committed by David S. Miller
parent 47b4c9a82f
commit 58311d1690
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/tipc/core.h
View File

@ -192,6 +192,7 @@ struct tipc_skb_cb {
struct sk_buff *tail; struct sk_buff *tail;
bool deferred; bool deferred;
bool wakeup_pending; bool wakeup_pending;
bool bundling;
u16 chain_sz; u16 chain_sz;
u16 chain_imp; u16 chain_imp;
}; };

2
net/tipc/link.c
View File

@ -875,7 +875,7 @@ void tipc_link_push_packets(struct tipc_link *l_ptr)
msg_set_ack(msg, mod(l_ptr->next_in_no - 1)); msg_set_ack(msg, mod(l_ptr->next_in_no - 1));
msg_set_bcast_ack(msg, l_ptr->owner->bclink.last_in); msg_set_bcast_ack(msg, l_ptr->owner->bclink.last_in);
if (msg_user(msg) == MSG_BUNDLER) if (msg_user(msg) == MSG_BUNDLER)
msg_set_type(msg, BUNDLE_CLOSED); TIPC_SKB_CB(skb)->bundling = false;
tipc_bearer_send(l_ptr->bearer_id, skb, tipc_bearer_send(l_ptr->bearer_id, skb,
&l_ptr->media_addr); &l_ptr->media_addr);
l_ptr->next_out = skb->next; l_ptr->next_out = skb->next;

5
net/tipc/msg.c
View File

@ -289,7 +289,7 @@ bool tipc_msg_bundle(struct sk_buff *bbuf, struct sk_buff *buf, u32 mtu)
return false; return false;
if (likely(msg_user(bmsg) != MSG_BUNDLER)) if (likely(msg_user(bmsg) != MSG_BUNDLER))
return false; return false;
if (likely(msg_type(bmsg) != BUNDLE_OPEN)) if (likely(!TIPC_SKB_CB(bbuf)->bundling))
return false; return false;
if (unlikely(skb_tailroom(bbuf) < (pad + msz))) if (unlikely(skb_tailroom(bbuf) < (pad + msz)))
return false; return false;
@ -336,11 +336,12 @@ bool tipc_msg_make_bundle(struct sk_buff **buf, u32 mtu, u32 dnode)
skb_trim(bbuf, INT_H_SIZE); skb_trim(bbuf, INT_H_SIZE);
bmsg = buf_msg(bbuf); bmsg = buf_msg(bbuf);
tipc_msg_init(bmsg, MSG_BUNDLER, BUNDLE_OPEN, INT_H_SIZE, dnode); tipc_msg_init(bmsg, MSG_BUNDLER, 0, INT_H_SIZE, dnode);
msg_set_seqno(bmsg, msg_seqno(msg)); msg_set_seqno(bmsg, msg_seqno(msg));
msg_set_ack(bmsg, msg_ack(msg)); msg_set_ack(bmsg, msg_ack(msg));
msg_set_bcast_ack(bmsg, msg_bcast_ack(msg)); msg_set_bcast_ack(bmsg, msg_bcast_ack(msg));
bbuf->next = (*buf)->next; bbuf->next = (*buf)->next;
TIPC_SKB_CB(bbuf)->bundling = true;
tipc_msg_bundle(bbuf, *buf, mtu); tipc_msg_bundle(bbuf, *buf, mtu);
*buf = bbuf; *buf = bbuf;
return true; return true;

5
net/tipc/msg.h
View File

@ -464,11 +464,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m)
#define FRAGMENT 1 #define FRAGMENT 1
#define LAST_FRAGMENT 2 #define LAST_FRAGMENT 2
/* Bundling protocol message types
*/
#define BUNDLE_OPEN 0
#define BUNDLE_CLOSED 1
/* /*
* Link management protocol message types * Link management protocol message types
*/ */