Commit 949cf8b1 authored Oct 29, 2017 by David S. Miller

tcp: Remove "linux/unaligned/access_ok.h" include.



This causes build failures:

In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:7:28: error: redefinition of
'get_unaligned_le16'
In file included from ./include/asm-generic/unaligned.h:17:0,
                 from ./arch/arm/include/generated/asm/unaligned.h:1,
                 from net/ipv4/tcp_input.c:76:
./include/linux/unaligned/le_struct.h:6:19: note: previous definition
of 'get_unaligned_le16' was here
In file included from net/ipv4/tcp_input.c:79:0:
./include/linux/unaligned/access_ok.h:12:28: error: redefinition of
'get_unaligned_le32'

Plain "asm/access_ok.h", which is already included, is
sufficient.

Fixes: 60e2a778 ("tcp: TCP experimental option for SMC")
Reported-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c69fe407

net/ipv4/tcp_input.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,6 @@
	#include <asm/unaligned.h>		#include <asm/unaligned.h>
	#include <linux/errqueue.h>		#include <linux/errqueue.h>
	#include <trace/events/tcp.h>		#include <trace/events/tcp.h>
	#include <linux/unaligned/access_ok.h>
	#include <linux/static_key.h>		#include <linux/static_key.h>

	int sysctl_tcp_max_orphans __read_mostly = NR_FILE;		int sysctl_tcp_max_orphans __read_mostly = NR_FILE;

Admin message