diff options
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 2 | ||||
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index d6846393182d..761a910f4f97 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -820,7 +820,7 @@ static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_txoptions *opt, | |||
| 820 | return 0; | 820 | return 0; |
| 821 | 821 | ||
| 822 | len = min_t(unsigned int, len, ipv6_optlen(hdr)); | 822 | len = min_t(unsigned int, len, ipv6_optlen(hdr)); |
| 823 | if (copy_to_user(optval, hdr, len)); | 823 | if (copy_to_user(optval, hdr, len)) |
| 824 | return -EFAULT; | 824 | return -EFAULT; |
| 825 | return ipv6_optlen(hdr); | 825 | return ipv6_optlen(hdr); |
| 826 | } | 826 | } |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index cbdb78487915..0f7defb482e9 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | #include <net/inet_ecn.h> | 56 | #include <net/inet_ecn.h> |
| 57 | #include <net/protocol.h> | 57 | #include <net/protocol.h> |
| 58 | #include <net/xfrm.h> | 58 | #include <net/xfrm.h> |
| 59 | #include <net/addrconf.h> | ||
| 60 | #include <net/snmp.h> | 59 | #include <net/snmp.h> |
| 61 | #include <net/dsfield.h> | 60 | #include <net/dsfield.h> |
| 62 | #include <net/timewait_sock.h> | 61 | #include <net/timewait_sock.h> |