hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jon Maloy 2019-06-25 19:37:00 +02:00 committed by David S. Miller
parent 20c6731294
commit a7dc51adca
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/tipc/bcast.c
View File

@ -323,7 +323,7 @@ static int tipc_mcast_send_sync(struct net *net, struct sk_buff *skb,
hdr = buf_msg(skb); hdr = buf_msg(skb);
if (msg_user(hdr) == MSG_FRAGMENTER) if (msg_user(hdr) == MSG_FRAGMENTER)
hdr = msg_get_wrapped(hdr); hdr = msg_inner_hdr(hdr);
if (msg_type(hdr) != TIPC_MCAST_MSG) if (msg_type(hdr) != TIPC_MCAST_MSG)
return 0; return 0;
@ -392,7 +392,7 @@ int tipc_mcast_xmit(struct net *net, struct sk_buff_head *pkts,
skb = skb_peek(pkts); skb = skb_peek(pkts);
hdr = buf_msg(skb); hdr = buf_msg(skb);
if (msg_user(hdr) == MSG_FRAGMENTER) if (msg_user(hdr) == MSG_FRAGMENTER)
hdr = msg_get_wrapped(hdr); hdr = msg_inner_hdr(hdr);
msg_set_is_rcast(hdr, method->rcast); msg_set_is_rcast(hdr, method->rcast);
/* Switch method ? */ /* Switch method ? */

2
net/tipc/link.c
View File

@ -732,7 +732,7 @@ static void link_profile_stats(struct tipc_link *l)
if (msg_user(msg) == MSG_FRAGMENTER) { if (msg_user(msg) == MSG_FRAGMENTER) {
if (msg_type(msg) != FIRST_FRAGMENT) if (msg_type(msg) != FIRST_FRAGMENT)
return; return;
length = msg_size(msg_get_wrapped(msg)); length = msg_size(msg_inner_hdr(msg));
} }
l->stats.msg_lengths_total += length; l->stats.msg_lengths_total += length;
l->stats.msg_length_counts++; l->stats.msg_length_counts++;

4
net/tipc/msg.h
View File

@ -308,7 +308,7 @@ static inline unchar *msg_data(struct tipc_msg *m)
return ((unchar *)m) + msg_hdr_sz(m); return ((unchar *)m) + msg_hdr_sz(m);
} }
static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) static inline struct tipc_msg *msg_inner_hdr(struct tipc_msg *m)
{ {
return (struct tipc_msg *)msg_data(m); return (struct tipc_msg *)msg_data(m);
} }
@ -486,7 +486,7 @@ static inline void msg_set_prevnode(struct tipc_msg *m, u32 a)
static inline u32 msg_origport(struct tipc_msg *m) static inline u32 msg_origport(struct tipc_msg *m)
{ {
if (msg_user(m) == MSG_FRAGMENTER) if (msg_user(m) == MSG_FRAGMENTER)
m = msg_get_wrapped(m); m = msg_inner_hdr(m);
return msg_word(m, 4); return msg_word(m, 4);
} }

2
net/tipc/node.c
View File

@ -1649,7 +1649,7 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
int usr = msg_user(hdr); int usr = msg_user(hdr);
int mtyp = msg_type(hdr); int mtyp = msg_type(hdr);
u16 oseqno = msg_seqno(hdr); u16 oseqno = msg_seqno(hdr);
u16 iseqno = msg_seqno(msg_get_wrapped(hdr)); u16 iseqno = msg_seqno(msg_inner_hdr(hdr));
u16 exp_pkts = msg_msgcnt(hdr); u16 exp_pkts = msg_msgcnt(hdr);
u16 rcv_nxt, syncpt, dlv_nxt, inputq_len; u16 rcv_nxt, syncpt, dlv_nxt, inputq_len;
int state = n->state; int state = n->state;