Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1dd0bd2b14032037d40a316dd52370f1713fa62b

Authored by Jon Paul Maloy
Committed by David S. Miller
1 parent f9474ddfaa

tipc: introduce new function tipc_msg_create() 

The function tipc_msg_init() has turned out to be of limited value
in many cases. It take too few parameters to be usable for creating
a complete message, it makes too many assumptions about what the
message should be used for, and it does not allocate any buffer to
be returned to the caller.

Therefore, we now introduce the new function tipc_msg_create(), which
takes all the parameters needed to create a full message, and returns
a buffer of the requested size. The new function will be very useful
for the changes we will be doing in later commits in this series.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 33 additions and 2 deletions Side-by-side Diff

... ... @@ -56,8 +56,35 @@
56 56 msg_set_size(m, hsize);
57 57 msg_set_prevnode(m, tipc_own_addr);
58 58 msg_set_type(m, type);
59   - msg_set_orignode(m, tipc_own_addr);
60   - msg_set_destnode(m, destnode);
  59 + if (hsize > SHORT_H_SIZE) {
  60 + msg_set_orignode(m, tipc_own_addr);
  61 + msg_set_destnode(m, destnode);
  62 + }
  63 +}
  64 +
  65 +struct sk_buff *tipc_msg_create(uint user, uint type, uint hdr_sz,
  66 + uint data_sz, u32 dnode, u32 onode,
  67 + u32 dport, u32 oport, int errcode)
  68 +{
  69 + struct tipc_msg *msg;
  70 + struct sk_buff *buf;
  71 +
  72 + buf = tipc_buf_acquire(hdr_sz + data_sz);
  73 + if (unlikely(!buf))
  74 + return NULL;
  75 +
  76 + msg = buf_msg(buf);
  77 + tipc_msg_init(msg, user, type, hdr_sz, dnode);
  78 + msg_set_size(msg, hdr_sz + data_sz);
  79 + msg_set_prevnode(msg, onode);
  80 + msg_set_origport(msg, oport);
  81 + msg_set_destport(msg, dport);
  82 + msg_set_errcode(msg, errcode);
  83 + if (hdr_sz > SHORT_H_SIZE) {
  84 + msg_set_orignode(msg, onode);
  85 + msg_set_destnode(msg, dnode);
  86 + }
  87 + return buf;
61 88 }
62 89  
63 90 /* tipc_buf_append(): Append a buffer to the fragment list of another buffer
... ... @@ -732,6 +732,10 @@
732 732 void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, u32 hsize,
733 733 u32 destnode);
734 734  
  735 +struct sk_buff *tipc_msg_create(uint user, uint type, uint hdr_sz,
  736 + uint data_sz, u32 dnode, u32 onode,
  737 + u32 dport, u32 oport, int errcode);
  738 +
735 739 int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf);
736 740  
737 741 bool tipc_msg_bundle(struct sk_buff *bbuf, struct sk_buff *buf, u32 mtu);