diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-29 03:14:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-29 03:14:08 +0100 |
| commit | 949cf8b1dd39f6d306a681503b6031299fd7ced8 (patch) | |
| tree | 83c842cc300e9a27e6d94dff8c23ae9f3b1777a7 /net/ipv4 | |
| parent | cxgb3: Check and handle the dma mapping errors (diff) | |
| download | linux-949cf8b1dd39f6d306a681503b6031299fd7ced8.tar.xz linux-949cf8b1dd39f6d306a681503b6031299fd7ced8.zip | |
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: 60e2a7780793 ("tcp: TCP experimental option for SMC")
Reported-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_input.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 21c358c0cf2e..b62a7d1707ae 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -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; |