ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h

A following patch will use struct raw_sock to store state for ipmr,
so having the definitions in icmp.h doesn't fit very well anymore.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/icmp.h b/include/net/icmp.h
index 15b3dfe9fce8334611ba4549e3d32353585e036d..6e991e0d0d6fef8763a1d58693c373a7105c9ddc 100644 (file)
--- a/include/net/icmp.h
+++ b/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/include/net/raw.h b/include/net/raw.h
index 6c14a656357a8449dc79269ce992ee16fe6c6d89..67cc64369432b059f1a641cf48e7741566fa5195 100644 (file)
--- a/include/net/raw.h
+++ b/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 */