Message ID | 20220730090617.3101386-1-studentxswpy@163.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] mptcp: Fix spelling mistakes and cleanup code | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Clearly marked for net-next |
netdev/apply | fail | Patch does not apply to net-next |
On Sat, 30 Jul 2022, studentxswpy@163.com wrote: > From: Xie Shaowen <studentxswpy@163.com> > > fix follow spelling misktakes: > regarless ==> regardless > interaces ==> interfaces > > Reported-by: Hacash Robot <hacashRobot@santino.com> > Signed-off-by: Xie Shaowen <studentxswpy@163.com> Hello Xie Shaowen - These spelling errors were already fixed in commit d640516a65d8, merged 2022-06-28. Please make sure to work from an up-to-date branch! Thanks for your patch, Mat > --- > net/mptcp/pm_netlink.c | 2 +- > net/mptcp/subflow.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > index 7c7395b58944..5bdb559d5242 100644 > --- a/net/mptcp/pm_netlink.c > +++ b/net/mptcp/pm_netlink.c > @@ -1134,7 +1134,7 @@ void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ss > } > unlock_sock_fast(ssk, slow); > > - /* always try to push the pending data regarless of re-injections: > + /* always try to push the pending data regardless of re-injections: > * we can possibly use backup subflows now, and subflow selection > * is cheap under the msk socket lock > */ > diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c > index af28f3b60389..901c763dcdbb 100644 > --- a/net/mptcp/subflow.c > +++ b/net/mptcp/subflow.c > @@ -1634,7 +1634,7 @@ int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock) > /* the newly created socket really belongs to the owning MPTCP master > * socket, even if for additional subflows the allocation is performed > * by a kernel workqueue. Adjust inode references, so that the > - * procfs/diag interaces really show this one belonging to the correct > + * procfs/diag interfaces really show this one belonging to the correct > * user. > */ > SOCK_INODE(sf)->i_ino = SOCK_INODE(sk->sk_socket)->i_ino; > -- > 2.25.1 > > -- Mat Martineau Intel
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 7c7395b58944..5bdb559d5242 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1134,7 +1134,7 @@ void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ss } unlock_sock_fast(ssk, slow); - /* always try to push the pending data regarless of re-injections: + /* always try to push the pending data regardless of re-injections: * we can possibly use backup subflows now, and subflow selection * is cheap under the msk socket lock */ diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index af28f3b60389..901c763dcdbb 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1634,7 +1634,7 @@ int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock) /* the newly created socket really belongs to the owning MPTCP master * socket, even if for additional subflows the allocation is performed * by a kernel workqueue. Adjust inode references, so that the - * procfs/diag interaces really show this one belonging to the correct + * procfs/diag interfaces really show this one belonging to the correct * user. */ SOCK_INODE(sf)->i_ino = SOCK_INODE(sk->sk_socket)->i_ino;