Skip to content

Commit 38efebe

Browse files
Geliang Tangintel-lab-lkp
authored andcommitted
mptcp: drop skb parameter of get_addr
The first parameters 'skb' of get_addr() interfaces are now useless since mptcp_userspace_pm_get_sock() helper is used. This patch drops these useless parameters of them. Signed-off-by: Geliang Tang <[email protected]>
1 parent b06f7d2 commit 38efebe

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

net/mptcp/pm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,16 +434,16 @@ bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc)
434434
return mptcp_pm_nl_is_backup(msk, &skc_local);
435435
}
436436

437-
static int mptcp_pm_get_addr(struct sk_buff *skb, struct genl_info *info)
437+
static int mptcp_pm_get_addr(struct genl_info *info)
438438
{
439439
if (info->attrs[MPTCP_PM_ATTR_TOKEN])
440-
return mptcp_userspace_pm_get_addr(skb, info);
441-
return mptcp_pm_nl_get_addr(skb, info);
440+
return mptcp_userspace_pm_get_addr(info);
441+
return mptcp_pm_nl_get_addr(info);
442442
}
443443

444444
int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info)
445445
{
446-
return mptcp_pm_get_addr(skb, info);
446+
return mptcp_pm_get_addr(info);
447447
}
448448

449449
static int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)

net/mptcp/pm_netlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,7 @@ int mptcp_nl_fill_addr(struct sk_buff *skb,
17621762
return -EMSGSIZE;
17631763
}
17641764

1765-
int mptcp_pm_nl_get_addr(struct sk_buff *skb, struct genl_info *info)
1765+
int mptcp_pm_nl_get_addr(struct genl_info *info)
17661766
{
17671767
struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];
17681768
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);

net/mptcp/pm_userspace.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,7 @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
663663
return ret;
664664
}
665665

666-
int mptcp_userspace_pm_get_addr(struct sk_buff *skb,
667-
struct genl_info *info)
666+
int mptcp_userspace_pm_get_addr(struct genl_info *info)
668667
{
669668
struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];
670669
struct mptcp_pm_addr_entry addr, *entry;

net/mptcp/protocol.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,9 +1131,8 @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
11311131
struct netlink_callback *cb);
11321132
int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
11331133
struct netlink_callback *cb);
1134-
int mptcp_pm_nl_get_addr(struct sk_buff *skb, struct genl_info *info);
1135-
int mptcp_userspace_pm_get_addr(struct sk_buff *skb,
1136-
struct genl_info *info);
1134+
int mptcp_pm_nl_get_addr(struct genl_info *info);
1135+
int mptcp_userspace_pm_get_addr(struct genl_info *info);
11371136

11381137
static inline u8 subflow_get_local_id(const struct mptcp_subflow_context *subflow)
11391138
{

0 commit comments

Comments
 (0)