Squash to "mptcp: add a new sysctl scheduler"

[PATCH mptcp-next] Squash to "mptcp: add a new sysctl scheduler"

Geliang Tang posted 1 patch 2 years, 1 month ago

Download mbox

Failed in applying to current master (apply log)

net/mptcp/ctrl.c     | 2 +-
net/mptcp/protocol.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH mptcp-next] Squash to "mptcp: add a new sysctl scheduler"

Posted by Geliang Tang 2 years, 1 month ago

Add consts for mptcp_get_scheduler.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/ctrl.c     | 2 +-
 net/mptcp/protocol.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c
index 4e0811969d8c..c46c22a84d23 100644
--- a/net/mptcp/ctrl.c
+++ b/net/mptcp/ctrl.c
@@ -70,7 +70,7 @@ int mptcp_get_pm_type(const struct net *net)
 	return mptcp_get_pernet(net)->pm_type;
 }
 
-char *mptcp_get_scheduler(struct net *net)
+const char *mptcp_get_scheduler(const struct net *net)
 {
 	return mptcp_get_pernet(net)->scheduler;
 }
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 33720856bfed..03d5de0f659f 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -584,7 +584,7 @@ int mptcp_is_checksum_enabled(const struct net *net);
 int mptcp_allow_join_id0(const struct net *net);
 unsigned int mptcp_stale_loss_cnt(const struct net *net);
 int mptcp_get_pm_type(const struct net *net);
-char *mptcp_get_scheduler(struct net *net);
+const char *mptcp_get_scheduler(const struct net *net);
 int mptcp_register_scheduler(struct mptcp_sched_ops *sched);
 void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched);
 struct mptcp_sched_ops *mptcp_sched_find(const char *name);
-- 
2.34.1