diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-28 13:31:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-28 13:31:57 -0700 |
| commit | c948b46a7dcd131e3ac3d4ed48f9cfaaa9103d58 (patch) | |
| tree | e5597c97a249fc12795e10803f9c401d190720bc /net/tipc/bcast.c | |
| parent | 1b077ce1c5be7cdb0e40ea2c2565ed8c878b05e9 (diff) | |
| parent | d4cfb7fe5713521280925019e7a7857b373aa627 (diff) | |
| download | linux-c948b46a7dcd131e3ac3d4ed48f9cfaaa9103d58.tar.gz linux-c948b46a7dcd131e3ac3d4ed48f9cfaaa9103d58.tar.bz2 linux-c948b46a7dcd131e3ac3d4ed48f9cfaaa9103d58.zip | |
Merge branch 'tipc-next'
Menglong Dong says:
====================
net: tipc: fix FB_MTU eat two pages and do some code cleanup
In the first patch, FB_MTU is redefined to make sure data size will not
exceed PAGE_SIZE. Besides, I removed the alignment for buf_size in
tipc_buf_acquire, because skb_alloc_fclone will do the alignment job.
In the second patch, I removed align() in msg.c and replace it with
ALIGN().
Changes since V5:
- remove blank line after Fixes in commit log in the first patch
Changes since V4:
- remove ONE_PAGE_SKB_SZ and replace it with one_page_mtu in the first
patch.
- fix some code style problems for the second patch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bcast.c')
| -rw-r--r-- | net/tipc/bcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index d4beca895992..593846d25214 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -699,7 +699,7 @@ int tipc_bcast_init(struct net *net) spin_lock_init(&tipc_net(net)->bclock); if (!tipc_link_bc_create(net, 0, 0, NULL, - FB_MTU, + one_page_mtu, BCLINK_WIN_DEFAULT, BCLINK_WIN_DEFAULT, 0, |