Re: [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum"

[Geliang Tang <geliangtang@gmail.com>]

Hi Matt,

Geliang Tang <geliangtang@gmail.com> 于2021年5月6日周四 下午3:48写道：
>
> Rename DSSCSUM to DATACSUM.
>
> Please update the commit log too:
>
> '''
> This patch added the mib for the data checksum, MPTCP_MIB_DATACSUMERR.
> '''
>

Thanks for apply this patch to the export branch, please update the commit
log too:

MPTCP_MIB_DSSCSUMERR -> MPTCP_MIB_DATACSUMERR

Thanks.

-Geliang

> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
>  net/mptcp/mib.c     | 2 +-
>  net/mptcp/mib.h     | 2 +-
>  net/mptcp/subflow.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c
> index c7042e3317b5..e7e60bc1fb96 100644
> --- a/net/mptcp/mib.c
> +++ b/net/mptcp/mib.c
> @@ -25,7 +25,7 @@ static const struct snmp_mib mptcp_snmp_list[] = {
>         SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC),
>         SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH),
>         SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX),
> -       SNMP_MIB_ITEM("DSSCsumErr", MPTCP_MIB_DSSCSUMERR),
> +       SNMP_MIB_ITEM("DataCsumErr", MPTCP_MIB_DATACSUMERR),
>         SNMP_MIB_ITEM("OFOQueueTail", MPTCP_MIB_OFOQUEUETAIL),
>         SNMP_MIB_ITEM("OFOQueue", MPTCP_MIB_OFOQUEUE),
>         SNMP_MIB_ITEM("OFOMerge", MPTCP_MIB_OFOMERGE),
> diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h
> index c407358eced8..92e56c0cfbdd 100644
> --- a/net/mptcp/mib.h
> +++ b/net/mptcp/mib.h
> @@ -18,7 +18,7 @@ enum linux_mptcp_mib_field {
>         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 */
> -       MPTCP_MIB_DSSCSUMERR,           /* The DSS checksum fail */
> +       MPTCP_MIB_DATACSUMERR,          /* The data checksum fail */
>         MPTCP_MIB_OFOQUEUETAIL, /* Segments inserted into OoO queue tail */
>         MPTCP_MIB_OFOQUEUE,             /* Segments inserted into OoO queue */
>         MPTCP_MIB_OFOMERGE,             /* Segments merged in OoO queue */
> diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
> index f60a2fe1a2cf..c8968038174f 100644
> --- a/net/mptcp/subflow.c
> +++ b/net/mptcp/subflow.c
> @@ -902,7 +902,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff *
>
>         csum = csum_partial(&header, sizeof(header), subflow->map_data_csum);
>         if (unlikely(csum_fold(csum))) {
> -               MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSCSUMERR);
> +               MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR);
>                 return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY;
>         }
>
> --
> 2.31.1
>