diff options
author | Cong Wang <xiyou.wangcong@gmail.com> | 2014-10-27 16:50:17 (GMT) |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2014-11-24 12:21:15 (GMT) |
commit | b54f6d80239f9e13969b747bbfecb3ada37d61ad (patch) | |
tree | 879c14578e2ac49d659e4f98952c3ab801c3f565 /include/netlink-private | |
parent | 9c066b9271493ce3efff0b9d7b6e424990bba3f2 (diff) | |
download | libnl-b54f6d80239f9e13969b747bbfecb3ada37d61ad.zip libnl-b54f6d80239f9e13969b747bbfecb3ada37d61ad.tar.gz libnl-b54f6d80239f9e13969b747bbfecb3ada37d61ad.tar.bz2 |
idiag: add a copy of linux/sock_diag.h
When we test idiag on 3.4 kernel, we always get ERANGE.
This is because libnl has its own copy for SK_MEMINFO_*,
which is actually newer than 3.4, where SK_MEMINFO_VARS
is larger than kernel's.
We add a copy from latest kernel, so on older kernel
libnl should still compile. Note, for kernel < 3.6
we don't have SK_MEMINFO_BACKLOG, we have to relax
the minlen.
'sock_diag.h' comes from v3.17 kernel sources
(bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9), file
'include/uapi/linux/sock_diag.h'.
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'include/netlink-private')
-rw-r--r-- | include/netlink-private/types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h index 4ba13f7..b4dc8ac 100644 --- a/include/netlink-private/types.h +++ b/include/netlink-private/types.h @@ -1001,7 +1001,7 @@ struct idiagnl_msg { struct idiagnl_meminfo * idiag_meminfo; struct idiagnl_vegasinfo * idiag_vegasinfo; struct tcp_info idiag_tcpinfo; - uint32_t idiag_skmeminfo[IDIAG_SK_MEMINFO_VARS]; + uint32_t idiag_skmeminfo[SK_MEMINFO_VARS]; }; struct idiagnl_req { |