diff mbox series

[mptcp-next] Squash to "mptcp: remove id 0 address": reverse Xmas tree order

Message ID fdf6bc5a67730afe487dcd7b916c12dfb51e6177.1617091295.git.geliangtang@gmail.com
State Accepted, archived
Commit c941e73cc7dc6f1b0f320d30dfbae3ba580db17a
Delegated to: Matthieu Baerts
Headers show
Series [mptcp-next] Squash to "mptcp: remove id 0 address": reverse Xmas tree order | expand

Commit Message

Geliang Tang March 30, 2021, 8:02 a.m. UTC
Ues the "reverse Xmas tree" order.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 net/mptcp/pm_netlink.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Matthieu Baerts March 30, 2021, 1:42 p.m. UTC | #1
Hi Geliang,

On 30/03/2021 10:02, Geliang Tang wrote:
> Ues the "reverse Xmas tree" order.

Good catch!

Now in our repo:

- c941e73cc7dc: "squashed" in "mptcp: remove id 0 address"
- Results: ee61d54be9fd..a238b5e19fcb

Tests + export are in progress!

Cheers,
Matt
diff mbox series

Patch

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 745073ddded8..6ba040897738 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1162,9 +1162,9 @@  static void mptcp_pm_free_addr_entry(struct mptcp_pm_addr_entry *entry)
 static int mptcp_nl_remove_id_zero_address(struct net *net,
 					   struct mptcp_addr_info *addr)
 {
-	struct mptcp_sock *msk;
-	long s_slot = 0, s_num = 0;
 	struct mptcp_rm_list list = { .nr = 0 };
+	long s_slot = 0, s_num = 0;
+	struct mptcp_sock *msk;
 
 	list.ids[list.nr++] = 0;