* [MPTCP] [PATCH] mptcp: fix warnings reported by checkpatch
@ 2019-10-10 14:27 Matthieu Baerts
0 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2019-10-10 14:27 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 5046 bytes --]
WARNING: Improper SPDX comment style for 'net/mptcp/mib.c', please use '//' instead
+/* SPDX-License-Identifier: GPL-2.0-or-later */
WARNING: Missing or malformed SPDX-License-Identifier tag in line 1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
WARNING: line over 80 characters
+ SNMP_MIB_ITEM("MPCapableFallbackACK", MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK),
WARNING: line over 80 characters
+ SNMP_MIB_ITEM("MPCapableFallbackSYNACK", MPTCP_MIB_MPCAPABLEACTIVEFALLBACK),
WARNING: line over 80 characters
+ MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK,/* Server-side fallback during 3-way handshake */
WARNING: line over 80 characters
+ MPTCP_MIB_MPCAPABLEACTIVEFALLBACK, /* Client-side fallback during 3-way handshake */
WARNING: line over 80 characters
+ MPTCP_MIB_RETRANSSEGS, /* Segments retransmitted at the MPTCP-level */
WARNING: line over 80 characters
+ MPTCP_MIB_JOINNOTOKEN, /* Received MP_JOIN but the token was not found */
WARNING: line over 80 characters
+ MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the previous one */
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
to be squashed in "mptcp: add MIB counter infrastructure"
net/mptcp/mib.c | 32 +++++++++++++++++++++-----------
net/mptcp/mib.h | 30 ++++++++++++++++++++----------
2 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c
index 4ab627e877d1..1df0a4367532 100644
--- a/net/mptcp/mib.c
+++ b/net/mptcp/mib.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
#include <linux/seq_file.h>
#include <net/ip.h>
@@ -9,16 +9,26 @@
#include "mib.h"
static const struct snmp_mib mptcp_snmp_list[] = {
- SNMP_MIB_ITEM("MPCapableSYNRX", MPTCP_MIB_MPCAPABLEPASSIVE),
- SNMP_MIB_ITEM("MPCapableACKRX", MPTCP_MIB_MPCAPABLEPASSIVEACK),
- SNMP_MIB_ITEM("MPCapableFallbackACK", MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK),
- SNMP_MIB_ITEM("MPCapableFallbackSYNACK", MPTCP_MIB_MPCAPABLEACTIVEFALLBACK),
- SNMP_MIB_ITEM("MPTCPRetrans", MPTCP_MIB_RETRANSSEGS),
- SNMP_MIB_ITEM("MPJoinNoTokenFound", MPTCP_MIB_JOINNOTOKEN),
- SNMP_MIB_ITEM("MPJoinSynRx", MPTCP_MIB_JOINSYNRX),
- SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC),
- SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH),
- SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX),
+ SNMP_MIB_ITEM("MPCapableSYNRX",
+ MPTCP_MIB_MPCAPABLEPASSIVE),
+ SNMP_MIB_ITEM("MPCapableACKRX",
+ MPTCP_MIB_MPCAPABLEPASSIVEACK),
+ SNMP_MIB_ITEM("MPCapableFallbackACK",
+ MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK),
+ SNMP_MIB_ITEM("MPCapableFallbackSYNACK",
+ MPTCP_MIB_MPCAPABLEACTIVEFALLBACK),
+ SNMP_MIB_ITEM("MPTCPRetrans",
+ MPTCP_MIB_RETRANSSEGS),
+ SNMP_MIB_ITEM("MPJoinNoTokenFound",
+ MPTCP_MIB_JOINNOTOKEN),
+ SNMP_MIB_ITEM("MPJoinSynRx",
+ MPTCP_MIB_JOINSYNRX),
+ SNMP_MIB_ITEM("MPJoinAckHMacFailure",
+ MPTCP_MIB_JOINACKMAC),
+ SNMP_MIB_ITEM("DSSNotMatching",
+ MPTCP_MIB_DSSNOMATCH),
+ SNMP_MIB_ITEM("InfiniteMapRx",
+ MPTCP_MIB_INFINITEMAPRX),
SNMP_MIB_SENTINEL
};
diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h
index d50b53e8209b..71afd62327fb 100644
--- a/net/mptcp/mib.h
+++ b/net/mptcp/mib.h
@@ -2,16 +2,26 @@
enum linux_mptcp_mib_field {
MPTCP_MIB_NUM = 0,
- MPTCP_MIB_MPCAPABLEPASSIVE, /* Received SYN with MP_CAPABLE */
- MPTCP_MIB_MPCAPABLEPASSIVEACK, /* Received third ACK with MP_CAPABLE */
- MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK,/* Server-side fallback during 3-way handshake */
- MPTCP_MIB_MPCAPABLEACTIVEFALLBACK, /* Client-side fallback during 3-way handshake */
- MPTCP_MIB_RETRANSSEGS, /* Segments retransmitted at the MPTCP-level */
- MPTCP_MIB_JOINNOTOKEN, /* Received MP_JOIN but the token was not found */
- MPTCP_MIB_JOINSYNRX, /* Received a SYN + MP_JOIN */
- MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */
- MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the previous one */
- MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */
+ /* Received SYN with MP_CAPABLE */
+ MPTCP_MIB_MPCAPABLEPASSIVE,
+ /* Received third ACK with MP_CAPABLE */
+ MPTCP_MIB_MPCAPABLEPASSIVEACK,
+ /* Server-side fallback during 3-way handshake */
+ MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK,
+ /* Client-side fallback during 3-way handshake */
+ MPTCP_MIB_MPCAPABLEACTIVEFALLBACK,
+ /* Segments retransmitted at the MPTCP-level */
+ MPTCP_MIB_RETRANSSEGS,
+ /* Received MP_JOIN but the token was not found */
+ MPTCP_MIB_JOINNOTOKEN,
+ /* Received a SYN + MP_JOIN */
+ MPTCP_MIB_JOINSYNRX,
+ /* HMAC was wrong on ACK + MP_JOIN */
+ MPTCP_MIB_JOINACKMAC,
+ /* Received a new mapping that did not match the previous one */
+ MPTCP_MIB_DSSNOMATCH,
+ /* Received an infinite mapping */
+ MPTCP_MIB_INFINITEMAPRX,
__MPTCP_MIB_MAX
};
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [MPTCP] [PATCH] mptcp: fix warnings reported by checkpatch
@ 2019-10-10 14:27 Matthieu Baerts
0 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2019-10-10 14:27 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 1388 bytes --]
WARNING: line over 80 characters
#60: FILE: net/mptcp/protocol.c:1010:
+ MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK);
WARNING: line over 80 characters
#69: FILE: net/mptcp/protocol.c:1163:
+ MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVEFALLBACK);
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
to be squashed in "mptcp: increment MIB counters in a few places"
net/mptcp/protocol.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index e6ffab07d6ab..47f4c0aa37f8 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1007,7 +1007,8 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
new_sock->sk = NULL;
sock_release(new_sock);
- MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK);
+ MPTCP_INC_STATS(sock_net(sk),
+ MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK);
}
return newsk;
@@ -1160,7 +1161,8 @@ void mptcp_finish_connect(struct sock *sk, int mp_capable)
bh_unlock_sock(sk);
local_bh_enable();
} else {
- MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVEFALLBACK);
+ MPTCP_INC_STATS(sock_net(sk),
+ MPTCP_MIB_MPCAPABLEACTIVEFALLBACK);
}
inet_sk_state_store(sk, TCP_ESTABLISHED);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [MPTCP] [PATCH] mptcp: fix warnings reported by checkpatch
@ 2019-10-10 14:27 Matthieu Baerts
0 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2019-10-10 14:27 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 904 bytes --]
WARNING: 'regarless' may be misspelled - perhaps 'regardless'?
#13:
Note that now we need to call __mptcp_init_sock() regarless of mptcp
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
to be squashed in "mptcp: queue data for mptcp level retransmission"
.topmsg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.topmsg b/.topmsg
index 7e583db6e3ab..ab57e824a32c 100644
--- a/.topmsg
+++ b/.topmsg
@@ -10,7 +10,7 @@ the current page fragment can always host an MPTCP rtx queue entry.
The MPTCP rtx queue is flushed at disconnect() and close() time
-Note that now we need to call __mptcp_init_sock() regarless of mptcp
+Note that now we need to call __mptcp_init_sock() regardless of mptcp
enable status, as the destructor will try to walk the rtx_queue.
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [MPTCP] [PATCH] mptcp: fix warnings reported by checkpatch
@ 2019-10-10 14:27 Matthieu Baerts
0 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2019-10-10 14:27 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
WARNING: 'thi' may be misspelled - perhaps 'the'?
#77: FILE: net/mptcp/ctrl.c:38:
+ /* users with CAP_NET_ADMIN or root (not and) can change thi
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
to be squashed in "mptcp: new sysctl to control the activation per NS"
net/mptcp/ctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c
index 33de3ced2ba7..6023c9f722ea 100644
--- a/net/mptcp/ctrl.c
+++ b/net/mptcp/ctrl.c
@@ -35,7 +35,7 @@ static struct ctl_table mptcp_sysctl_table[] = {
.procname = "enabled",
.maxlen = sizeof(int),
.mode = 0644,
- /* users with CAP_NET_ADMIN or root (not and) can change thi
+ /* users with CAP_NET_ADMIN or root (not and) can change this
* value, same as other sysctl or the 'net' tree.
*/
.proc_handler = proc_dointvec,
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [MPTCP] [PATCH] mptcp: fix warnings reported by checkpatch
@ 2019-10-10 14:27 Matthieu Baerts
0 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2019-10-10 14:27 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 994 bytes --]
WARNING: line over 80 characters
#233: FILE: net/mptcp/options.c:47:
+ * negotiated, the receiver MUST close the subflow with a RST as it is
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
to be squashed in "mptcp: Handle MPTCP TCP options"
net/mptcp/options.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index cee4280647fe..adf65d3ff27b 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -44,8 +44,8 @@ void mptcp_parse_option(const unsigned char *ptr, int opsize,
*
* Section 3.3.0:
* "If a checksum is not present when its use has been
- * negotiated, the receiver MUST close the subflow with a RST as it is
- * considered broken."
+ * negotiated, the receiver MUST close the subflow with a RST as
+ * it is considered broken."
*
* We don't implement DSS checksum - fall back to TCP.
*/
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-10 14:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10 14:27 [MPTCP] [PATCH] mptcp: fix warnings reported by checkpatch Matthieu Baerts
-- strict thread matches above, loose matches on Subject: below --
2019-10-10 14:27 Matthieu Baerts
2019-10-10 14:27 Matthieu Baerts
2019-10-10 14:27 Matthieu Baerts
2019-10-10 14:27 Matthieu Baerts
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.