---

yaml --- r: 278803 b: refs/heads/master c: e7c466e h: refs/heads/master i: 278801: 913cd53 278799: 1eef5d3 v: v3
git-mirror · Dec 16, 2011 · 71c0480 · 71c0480
1 parent d571fb3
commit 71c0480
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,8 @@
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
+
+#define SOCK_DIAG_BY_FAMILY 20
+
 struct sk_buff;
 struct nlmsghdr;