| Message ID | 8d8984e8f73e37c87e69459fdef12fe9bab80949.1592209282.git.geliangtang@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v2] mptcp: drop MPTCP_PM_MAX_ADDR | expand |
Hi Geliang, On 15/06/2020 10:28, Geliang Tang wrote: > We have defined MPTCP_PM_ADDR_MAX in pm_netlink.c, so drop this duplicate macro. > > Fixes: 1b1c7a0ef7f3 ("mptcp: Add path manager interface") > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > Changes in v2: > - change Subject from "mptcp: unify MPTCP_PM_MAX_ADDR and MPTCP_PM_ADDR_MAX" Thank you for this v2, it looks good to me! Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> Cheers, Matt
From: Geliang Tang <geliangtang@gmail.com> Date: Mon, 15 Jun 2020 16:28:03 +0800 > We have defined MPTCP_PM_ADDR_MAX in pm_netlink.c, so drop this duplicate macro. > > Fixes: 1b1c7a0ef7f3 ("mptcp: Add path manager interface") > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > Changes in v2: > - change Subject from "mptcp: unify MPTCP_PM_MAX_ADDR and MPTCP_PM_ADDR_MAX" Applied, thank you.
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 809687d3f410..70ed698bd206 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -135,8 +135,6 @@ static inline __be32 mptcp_option(u8 subopt, u8 len, u8 nib, u8 field) ((nib & 0xF) << 8) | field); } -#define MPTCP_PM_MAX_ADDR 4 - struct mptcp_addr_info { sa_family_t family; __be16 port;
We have defined MPTCP_PM_ADDR_MAX in pm_netlink.c, so drop this duplicate macro. Fixes: 1b1c7a0ef7f3 ("mptcp: Add path manager interface") Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- Changes in v2: - change Subject from "mptcp: unify MPTCP_PM_MAX_ADDR and MPTCP_PM_ADDR_MAX" --- net/mptcp/protocol.h | 2 -- 1 file changed, 2 deletions(-)