Skip to content

Commit a7dc51a

Browse files
Jon Maloydavem330
authored andcommitted
tipc: rename function msg_get_wrapped() to msg_inner_hdr()
We rename the inline function msg_get_wrapped() to the more comprehensible msg_inner_hdr(). Signed-off-by: Jon Maloy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 20c6731 commit a7dc51a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

net/tipc/bcast.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ static int tipc_mcast_send_sync(struct net *net, struct sk_buff *skb,
323323

324324
hdr = buf_msg(skb);
325325
if (msg_user(hdr) == MSG_FRAGMENTER)
326-
hdr = msg_get_wrapped(hdr);
326+
hdr = msg_inner_hdr(hdr);
327327
if (msg_type(hdr) != TIPC_MCAST_MSG)
328328
return 0;
329329

@@ -392,7 +392,7 @@ int tipc_mcast_xmit(struct net *net, struct sk_buff_head *pkts,
392392
skb = skb_peek(pkts);
393393
hdr = buf_msg(skb);
394394
if (msg_user(hdr) == MSG_FRAGMENTER)
395-
hdr = msg_get_wrapped(hdr);
395+
hdr = msg_inner_hdr(hdr);
396396
msg_set_is_rcast(hdr, method->rcast);
397397

398398
/* Switch method ? */

net/tipc/link.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ static void link_profile_stats(struct tipc_link *l)
732732
if (msg_user(msg) == MSG_FRAGMENTER) {
733733
if (msg_type(msg) != FIRST_FRAGMENT)
734734
return;
735-
length = msg_size(msg_get_wrapped(msg));
735+
length = msg_size(msg_inner_hdr(msg));
736736
}
737737
l->stats.msg_lengths_total += length;
738738
l->stats.msg_length_counts++;

net/tipc/msg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ static inline unchar *msg_data(struct tipc_msg *m)
308308
return ((unchar *)m) + msg_hdr_sz(m);
309309
}
310310

311-
static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m)
311+
static inline struct tipc_msg *msg_inner_hdr(struct tipc_msg *m)
312312
{
313313
return (struct tipc_msg *)msg_data(m);
314314
}
@@ -486,7 +486,7 @@ static inline void msg_set_prevnode(struct tipc_msg *m, u32 a)
486486
static inline u32 msg_origport(struct tipc_msg *m)
487487
{
488488
if (msg_user(m) == MSG_FRAGMENTER)
489-
m = msg_get_wrapped(m);
489+
m = msg_inner_hdr(m);
490490
return msg_word(m, 4);
491491
}
492492

net/tipc/node.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
16491649
int usr = msg_user(hdr);
16501650
int mtyp = msg_type(hdr);
16511651
u16 oseqno = msg_seqno(hdr);
1652-
u16 iseqno = msg_seqno(msg_get_wrapped(hdr));
1652+
u16 iseqno = msg_seqno(msg_inner_hdr(hdr));
16531653
u16 exp_pkts = msg_msgcnt(hdr);
16541654
u16 rcv_nxt, syncpt, dlv_nxt, inputq_len;
16551655
int state = n->state;

0 commit comments

Comments
 (0)