1 files changed, 38 insertions, 3 deletions

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index abf5028db981..f1362b5447fc 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -34,6 +34,15 @@ struct inet_diag_req {
         __u32   idiag_dbs;              /* Tables to dump (NI) */
 };
 
+struct inet_diag_req_v2 {
+        __u8    sdiag_family;
+        __u8    sdiag_protocol;
+        __u8    idiag_ext;
+        __u8    pad;
+        __u32   idiag_states;
+        struct inet_diag_sockid id;
+};
+
 enum {
         INET_DIAG_REQ_NONE,
         INET_DIAG_REQ_BYTECODE,
@@ -99,9 +108,10 @@ enum {
         INET_DIAG_CONG,
         INET_DIAG_TOS,
         INET_DIAG_TCLASS,
+        INET_DIAG_SKMEMINFO,
 };
 
-#define INET_DIAG_MAX INET_DIAG_TCLASS
+#define INET_DIAG_MAX INET_DIAG_SKMEMINFO
 
 
 /* INET_DIAG_MEM */
@@ -125,16 +135,41 @@ struct tcpvegas_info {
 #ifdef __KERNEL__
 struct sock;
 struct inet_hashinfo;
+struct nlattr;
+struct nlmsghdr;
+struct sk_buff;
+struct netlink_callback;
 
 struct inet_diag_handler {
-        struct inet_hashinfo    *idiag_hashinfo;
+        void                    (*dump)(struct sk_buff *skb,
+                                        struct netlink_callback *cb,
+                                        struct inet_diag_req_v2 *r,
+                                        struct nlattr *bc);
+
+        int                     (*dump_one)(struct sk_buff *in_skb,
+                                        const struct nlmsghdr *nlh,
+                                        struct inet_diag_req_v2 *req);
+
         void                    (*idiag_get_info)(struct sock *sk,
                                                   struct inet_diag_msg *r,
                                                   void *info);
-        __u16                   idiag_info_size;
         __u16                   idiag_type;
 };
 
+struct inet_connection_sock;
+int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
+                              struct sk_buff *skb, struct inet_diag_req_v2 *req,
+                              u32 pid, u32 seq, u16 nlmsg_flags,
+                              const struct nlmsghdr *unlh);
+void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb,
+                struct netlink_callback *cb, struct inet_diag_req_v2 *r,
+                struct nlattr *bc);
+int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,
+                struct sk_buff *in_skb, const struct nlmsghdr *nlh,
+                struct inet_diag_req_v2 *req);
+
+int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);
+
 extern int  inet_diag_register(const struct inet_diag_handler *handler);
 extern void inet_diag_unregister(const struct inet_diag_handler *handler);
 #endif /* __KERNEL__ */