From 71c0480328982570c078a4d19b4e970a91eaecd4 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@parallels.com>
Date: Thu, 15 Dec 2011 02:42:42 +0000
Subject: [PATCH] --- yaml --- r: 278803 b: refs/heads/master c:
 e7c466e58eb1ff9bf49c2f3902622dc11a8c7022 h: refs/heads/master i:   278801:
 913cd53b79a90453196a4d32514a596ab3f81226   278799:
 1eef5d319adef60df101d996e2a81d57549dfa67 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/inet_diag.h | 1 -
 trunk/include/linux/sock_diag.h | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 15353e59775a..c5723be570c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b26e478f8fd5b575684f021b05a5c6236ebb911a
+refs/heads/master: e7c466e58eb1ff9bf49c2f3902622dc11a8c7022
diff --git a/trunk/include/linux/inet_diag.h b/trunk/include/linux/inet_diag.h
index 78972a149dff..a27e62178d43 100644
--- a/trunk/include/linux/inet_diag.h
+++ b/trunk/include/linux/inet_diag.h
@@ -6,7 +6,6 @@
 /* Just some random number */
 #define TCPDIAG_GETSOCK 18
 #define DCCPDIAG_GETSOCK 19
-#define SOCK_DIAG_BY_FAMILY 20
 
 #define INET_DIAG_GETSOCK_MAX 24
 
diff --git a/trunk/include/linux/sock_diag.h b/trunk/include/linux/sock_diag.h
index ba4933b1213b..7999778ad08d 100644
--- a/trunk/include/linux/sock_diag.h
+++ b/trunk/include/linux/sock_diag.h
@@ -1,5 +1,8 @@
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
+
+#define SOCK_DIAG_BY_FAMILY 20
+
 struct sk_buff;
 struct nlmsghdr;