tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Jon Maloy and committed by
David S. Miller a7dc51ad 20c67312

+6 -6
+2 -2
net/tipc/bcast.c
··· 323 323 324 324 hdr = buf_msg(skb); 325 325 if (msg_user(hdr) == MSG_FRAGMENTER) 326 - hdr = msg_get_wrapped(hdr); 326 + hdr = msg_inner_hdr(hdr); 327 327 if (msg_type(hdr) != TIPC_MCAST_MSG) 328 328 return 0; 329 329 ··· 392 392 skb = skb_peek(pkts); 393 393 hdr = buf_msg(skb); 394 394 if (msg_user(hdr) == MSG_FRAGMENTER) 395 - hdr = msg_get_wrapped(hdr); 395 + hdr = msg_inner_hdr(hdr); 396 396 msg_set_is_rcast(hdr, method->rcast); 397 397 398 398 /* Switch method ? */
+1 -1
net/tipc/link.c
··· 732 732 if (msg_user(msg) == MSG_FRAGMENTER) { 733 733 if (msg_type(msg) != FIRST_FRAGMENT) 734 734 return; 735 - length = msg_size(msg_get_wrapped(msg)); 735 + length = msg_size(msg_inner_hdr(msg)); 736 736 } 737 737 l->stats.msg_lengths_total += length; 738 738 l->stats.msg_length_counts++;
+2 -2
net/tipc/msg.h
··· 308 308 return ((unchar *)m) + msg_hdr_sz(m); 309 309 } 310 310 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) 312 312 { 313 313 return (struct tipc_msg *)msg_data(m); 314 314 } ··· 486 486 static inline u32 msg_origport(struct tipc_msg *m) 487 487 { 488 488 if (msg_user(m) == MSG_FRAGMENTER) 489 - m = msg_get_wrapped(m); 489 + m = msg_inner_hdr(m); 490 490 return msg_word(m, 4); 491 491 } 492 492
+1 -1
net/tipc/node.c
··· 1649 1649 int usr = msg_user(hdr); 1650 1650 int mtyp = msg_type(hdr); 1651 1651 u16 oseqno = msg_seqno(hdr); 1652 - u16 iseqno = msg_seqno(msg_get_wrapped(hdr)); 1652 + u16 iseqno = msg_seqno(msg_inner_hdr(hdr)); 1653 1653 u16 exp_pkts = msg_msgcnt(hdr); 1654 1654 u16 rcv_nxt, syncpt, dlv_nxt, inputq_len; 1655 1655 int state = n->state;