[Devel,RHEL7,COMMIT] ms/net: ip, diag: include net/inet_sock.h

Submitted by Konstantin Khorenko on Nov. 23, 2016, 3:28 p.m.

Details

Message ID 201611231528.uANFSSIN010622@finist_cl7.x64_64.work.ct
State New
Series "ipv6: add IPV6_HDRINCL option for raw sockets"
Headers show

Commit Message

Konstantin Khorenko Nov. 23, 2016, 3:28 p.m.
The commit is pushed to "branch-rh7-3.10.0-327.36.1.vz7.20.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.36.1.vz7.20.1
------>
commit 7d46d35fcea27b8940e50c6b2879c9b522ecb418
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Wed Nov 23 19:28:28 2016 +0400

    ms/net: ip, diag: include net/inet_sock.h
    
    Patchset description:
    
    These are backports from net-next tree. The patches are needed
    to support c/r of raw sockets (criu part is to be implemented).
    
    https://jira.sw.ru/browse/PSBM-51614
    
    ===
    This patch description:
    
    net-next: f8da977989c5d5d2f38e025d4ac1e18243723dbb
    
    The newly added raw_diag.c fails to build in some configurations
    unless we include this header:
    
    In file included from net/ipv4/raw_diag.c:6:0:
    include/net/raw.h:71:21: error: field 'inet' has incomplete type
    net/ipv4/raw_diag.c: In function 'raw_diag_dump':
    net/ipv4/raw_diag.c:166:29: error: implicit declaration of function 'inet_sk'
    
    Fixes: 432490f9d455 ("net: ip, diag -- Add diag interface for raw sockets")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
---
 net/ipv4/raw_diag.c | 1 +
 1 file changed, 1 insertion(+)

Patch hide | download patch | download mbox

diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c
index d1dae28..1c31706 100644
--- a/net/ipv4/raw_diag.c
+++ b/net/ipv4/raw_diag.c
@@ -3,6 +3,7 @@ 
 #include <linux/inet_diag.h>
 #include <linux/sock_diag.h>
 
+#include <net/inet_sock.h>
 #include <net/raw.h>
 #include <net/rawv6.h>