diff mbox series

squash-to: "tcp: Define IPPROTO_MPTCP"

Message ID fd9848c19b14b56061bdf660e55b9f3ddb443736.1576252967.git.dcaratti@redhat.com
State Accepted, archived
Delegated to: Matthieu Baerts
Headers show
Series squash-to: "tcp: Define IPPROTO_MPTCP" | expand

Commit Message

Davide Caratti Dec. 13, 2019, 4:06 p.m. UTC
checkpatch fixes

Signed-off-by: Davide Caratti <dcaratti@redhat.com>
---
 include/uapi/linux/in.h       | 2 +-
 tools/include/uapi/linux/in.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Paolo Abeni Dec. 13, 2019, 4:08 p.m. UTC | #1
On Fri, 2019-12-13 at 17:06 +0100, Davide Caratti wrote:
> checkpatch fixes
> 
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
> ---
>  include/uapi/linux/in.h       | 2 +-
>  tools/include/uapi/linux/in.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
> index 44df6dc1ff1d..1521073b6348 100644
> --- a/include/uapi/linux/in.h
> +++ b/include/uapi/linux/in.h
> @@ -76,7 +76,7 @@ enum {
>  #define IPPROTO_MPLS		IPPROTO_MPLS
>    IPPROTO_RAW = 255,		/* Raw IP packets			*/
>  #define IPPROTO_RAW		IPPROTO_RAW
> -  IPPROTO_MPTCP = 262,		/* Multipath TCP connection 		*/
> +  IPPROTO_MPTCP = 262,		/* Multipath TCP connection		*/
>  #define IPPROTO_MPTCP		IPPROTO_MPTCP
>    IPPROTO_MAX
>  };
> diff --git a/tools/include/uapi/linux/in.h b/tools/include/uapi/linux/in.h
> index 44df6dc1ff1d..1521073b6348 100644
> --- a/tools/include/uapi/linux/in.h
> +++ b/tools/include/uapi/linux/in.h
> @@ -76,7 +76,7 @@ enum {
>  #define IPPROTO_MPLS		IPPROTO_MPLS
>    IPPROTO_RAW = 255,		/* Raw IP packets			*/
>  #define IPPROTO_RAW		IPPROTO_RAW
> -  IPPROTO_MPTCP = 262,		/* Multipath TCP connection 		*/
> +  IPPROTO_MPTCP = 262,		/* Multipath TCP connection		*/
>  #define IPPROTO_MPTCP		IPPROTO_MPTCP
>    IPPROTO_MAX
>  };

Since is not ovious without hexdifd, this replaces \s\t with \t just
after 'Multipath TCP connection'

ACK.
Matthieu Baerts Dec. 13, 2019, 5:21 p.m. UTC | #2
Hi Davide, Paolo,

On 13/12/2019 17:06, Davide Caratti wrote:
> checkpatch fixes

Thank you for all the patches and the reviews!

- d1d5675e23f0: "squashed" patch 1/8 in "tcp: Define IPPROTO_MPTCP"
- 99c94db6e8c0..db6012c0c18c: result

- 97ea094740dd: "squashed" patch 2/8 in "mptcp: Write MPTCP DSS headers 
to outgoing data packets"
- db6012c0c18c..c26e1b52fb44: result

- 32793cb1ed54: "squashed" patch 3/8 in "mptcp: recvmsg() can drain data 
from multiple subflows"
- c26e1b52fb44..6a32a0cf0e5e: result

- 197fac0677b3: "squashed" patch 4/8 in "mptcp: Handle MPTCP TCP options"
- 9faccdc66fd1: conflict in t/mptcp-Add-ADD_ADDR-handling
- 6a32a0cf0e5e..52505c2de61f: result

- 73ff77bca8e9: "squashed" patch 5/8 in "mptcp: add subflow write space 
signalling and mptcp_poll"
- 52505c2de61f..029510754aff: result

- 4fd352adc42e: "squashed" patch 6/8 in "mptcp: Add key generation and 
token tree"
- 5514f4b67855: conflict in t/mptcp-move-from-sha1-v0-to-sha256-v1
- Note: no checkpatch.pl issues in this one but a funny false alarm:
WARNING: 'ba' may be misspelled - perhaps 'by'?
#193: FILE: net/mptcp/crypto.c:119:
+               .result = "e73b9ba9969969cefb04aa0d6df18ec2fcc075b6",
- 029510754aff..6fc1a65b4990: result

- a3c84f7f0b33: "squashed" patch 7/8 in "mptcp: Implement MPTCP receive 
path"
- 6fc1a65b4990..37578acde78f: result

- d6f69fd25d7c: "squashed" in "mptcp: add basic kselftest for mptcp"
- 37578acde78f..bc663afcd33e: result

Tests + export are in progress!

Cheers,
Matt
diff mbox series

Patch

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index 44df6dc1ff1d..1521073b6348 100644
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -76,7 +76,7 @@  enum {
 #define IPPROTO_MPLS		IPPROTO_MPLS
   IPPROTO_RAW = 255,		/* Raw IP packets			*/
 #define IPPROTO_RAW		IPPROTO_RAW
-  IPPROTO_MPTCP = 262,		/* Multipath TCP connection 		*/
+  IPPROTO_MPTCP = 262,		/* Multipath TCP connection		*/
 #define IPPROTO_MPTCP		IPPROTO_MPTCP
   IPPROTO_MAX
 };
diff --git a/tools/include/uapi/linux/in.h b/tools/include/uapi/linux/in.h
index 44df6dc1ff1d..1521073b6348 100644
--- a/tools/include/uapi/linux/in.h
+++ b/tools/include/uapi/linux/in.h
@@ -76,7 +76,7 @@  enum {
 #define IPPROTO_MPLS		IPPROTO_MPLS
   IPPROTO_RAW = 255,		/* Raw IP packets			*/
 #define IPPROTO_RAW		IPPROTO_RAW
-  IPPROTO_MPTCP = 262,		/* Multipath TCP connection 		*/
+  IPPROTO_MPTCP = 262,		/* Multipath TCP connection		*/
 #define IPPROTO_MPTCP		IPPROTO_MPTCP
   IPPROTO_MAX
 };