]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
tcp: Remove "linux/unaligned/access_ok.h" include.
authorDavid S. Miller <davem@davemloft.net>
Sun, 29 Oct 2017 02:14:08 +0000 (11:14 +0900)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Oct 2017 02:14:08 +0000 (11:14 +0900)
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: 60e2a7780793 ("tcp: TCP experimental option for SMC")
Reported-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index 21c358c0cf2ea6c4a7bcf22b0490e043a57dc680..b62a7d1707ae19fba871ce22e4fc617ab7f467b9 100644 (file)
@@ -76,7 +76,6 @@
 #include <asm/unaligned.h>
 #include <linux/errqueue.h>
 #include <trace/events/tcp.h>
-#include <linux/unaligned/access_ok.h>
 #include <linux/static_key.h>
 
 int sysctl_tcp_max_orphans __read_mostly = NR_FILE;