Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: tipc: replace align() with ALIGN in msg.c

Browse Source 
The function align() which is defined in msg.c is redundant, replace it
with ALIGN() and introduce a BUF_ALIGN().

Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Menglong Dong 2021-06-27 23:37:45 -07:00 committed by David S. Miller
parent 0c6de0c943
commit d4cfb7fe57
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/tipc/msg.c
View File

@ -41,6 +41,7 @@
#include "name_table.h" #include "name_table.h"
#include "crypto.h" #include "crypto.h"
#define BUF_ALIGN(x) ALIGN(x, 4)
#define MAX_FORWARD_SIZE 1024 #define MAX_FORWARD_SIZE 1024
#ifdef CONFIG_TIPC_CRYPTO #ifdef CONFIG_TIPC_CRYPTO
#define BUF_HEADROOM ALIGN(((LL_MAX_HEADER + 48) + EHDR_MAX_SIZE), 16) #define BUF_HEADROOM ALIGN(((LL_MAX_HEADER + 48) + EHDR_MAX_SIZE), 16)
@ -53,11 +54,6 @@
const int one_page_mtu = PAGE_SIZE - SKB_DATA_ALIGN(BUF_OVERHEAD) - const int one_page_mtu = PAGE_SIZE - SKB_DATA_ALIGN(BUF_OVERHEAD) -
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
static unsigned int align(unsigned int i)
{
return (i + 3) & ~3u;
}
/** /**
* tipc_buf_acquire - creates a TIPC message buffer * tipc_buf_acquire - creates a TIPC message buffer
* @size: message size (including TIPC header) * @size: message size (including TIPC header)
@ -489,7 +485,7 @@ static bool tipc_msg_bundle(struct sk_buff *bskb, struct tipc_msg *msg,
msz = msg_size(msg); msz = msg_size(msg);
bsz = msg_size(bmsg); bsz = msg_size(bmsg);
offset = align(bsz); offset = BUF_ALIGN(bsz);
pad = offset - bsz; pad = offset - bsz;
if (unlikely(skb_tailroom(bskb) < (pad + msz))) if (unlikely(skb_tailroom(bskb) < (pad + msz)))
@ -546,7 +542,7 @@ bool tipc_msg_try_bundle(struct sk_buff *tskb, struct sk_buff **skb, u32 mss,
/* Make a new bundle of the two messages if possible */ /* Make a new bundle of the two messages if possible */
tsz = msg_size(buf_msg(tskb)); tsz = msg_size(buf_msg(tskb));
if (unlikely(mss < align(INT_H_SIZE + tsz) + msg_size(msg))) if (unlikely(mss < BUF_ALIGN(INT_H_SIZE + tsz) + msg_size(msg)))
return true; return true;
if (unlikely(pskb_expand_head(tskb, INT_H_SIZE, mss - tsz - INT_H_SIZE, if (unlikely(pskb_expand_head(tskb, INT_H_SIZE, mss - tsz - INT_H_SIZE,
GFP_ATOMIC))) GFP_ATOMIC)))
@ -605,7 +601,7 @@ bool tipc_msg_extract(struct sk_buff *skb, struct sk_buff **iskb, int *pos)
if (unlikely(!tipc_msg_validate(iskb))) if (unlikely(!tipc_msg_validate(iskb)))
goto none; goto none;
*pos += align(imsz); *pos += BUF_ALIGN(imsz);
return true; return true;
none: none:
kfree_skb(skb); kfree_skb(skb);