From ca1e1cf9698d126cb900ded7b5287d5d7010add3 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 13 Apr 2010 05:03:18 +0000
Subject: [PATCH] --- yaml --- r: 194055 b: refs/heads/master c:
 f74e49b5613206fb18468bdc9509a1db746aa01b h: refs/heads/master i:   194053:
 59631d86a6e201bf5c1aee549b1076e3c17c807d   194051:
 7a8703b87428a680826bd79e6aadef73f7d5252c   194047:
 012cb600ca78513c17e0414df71d4836b087dba1 v: v3

---
 [refs]                   |  2 +-
 trunk/include/net/icmp.h | 11 -----------
 trunk/include/net/raw.h  | 12 ++++++++++++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 1f9d4488b3ce..8d1c1c274e3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f87b1dd01b51dc3c789f7a212656a4a87eee1bd
+refs/heads/master: f74e49b5613206fb18468bdc9509a1db746aa01b
diff --git a/trunk/include/net/icmp.h b/trunk/include/net/icmp.h
index 15b3dfe9fce8..6e991e0d0d6f 100644
--- a/trunk/include/net/icmp.h
+++ b/trunk/include/net/icmp.h
@@ -48,15 +48,4 @@ extern void	icmp_out_count(struct net *net, unsigned char type);
 /* Move into dst.h ? */
 extern int 	xrlim_allow(struct dst_entry *dst, int timeout);
 
-struct raw_sock {
-	/* inet_sock has to be the first member */
-	struct inet_sock   inet;
-	struct icmp_filter filter;
-};
-
-static inline struct raw_sock *raw_sk(const struct sock *sk)
-{
-	return (struct raw_sock *)sk;
-}
-
 #endif	/* _ICMP_H */
diff --git a/trunk/include/net/raw.h b/trunk/include/net/raw.h
index 6c14a656357a..67cc64369432 100644
--- a/trunk/include/net/raw.h
+++ b/trunk/include/net/raw.h
@@ -19,6 +19,7 @@
 
 
 #include <net/protocol.h>
+#include <linux/icmp.h>
 
 extern struct proto raw_prot;
 
@@ -56,4 +57,15 @@ int raw_seq_open(struct inode *ino, struct file *file,
 void raw_hash_sk(struct sock *sk);
 void raw_unhash_sk(struct sock *sk);
 
+struct raw_sock {
+	/* inet_sock has to be the first member */
+	struct inet_sock   inet;
+	struct icmp_filter filter;
+};
+
+static inline struct raw_sock *raw_sk(const struct sock *sk)
+{
+	return (struct raw_sock *)sk;
+}
+
 #endif	/* _RAW_H */