diff options
-rw-r--r-- | include/net/icmp.h | 11 | ||||
-rw-r--r-- | include/net/raw.h | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/include/net/icmp.h b/include/net/icmp.h index 15b3dfe9fce8..6e991e0d0d6f 100644 --- 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); | |||
48 | /* Move into dst.h ? */ | 48 | /* Move into dst.h ? */ |
49 | extern int xrlim_allow(struct dst_entry *dst, int timeout); | 49 | extern int xrlim_allow(struct dst_entry *dst, int timeout); |
50 | 50 | ||
51 | struct raw_sock { | ||
52 | /* inet_sock has to be the first member */ | ||
53 | struct inet_sock inet; | ||
54 | struct icmp_filter filter; | ||
55 | }; | ||
56 | |||
57 | static inline struct raw_sock *raw_sk(const struct sock *sk) | ||
58 | { | ||
59 | return (struct raw_sock *)sk; | ||
60 | } | ||
61 | |||
62 | #endif /* _ICMP_H */ | 51 | #endif /* _ICMP_H */ |
diff --git a/include/net/raw.h b/include/net/raw.h index 6c14a656357a..67cc64369432 100644 --- a/include/net/raw.h +++ b/include/net/raw.h | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | 20 | ||
21 | #include <net/protocol.h> | 21 | #include <net/protocol.h> |
22 | #include <linux/icmp.h> | ||
22 | 23 | ||
23 | extern struct proto raw_prot; | 24 | extern struct proto raw_prot; |
24 | 25 | ||
@@ -56,4 +57,15 @@ int raw_seq_open(struct inode *ino, struct file *file, | |||
56 | void raw_hash_sk(struct sock *sk); | 57 | void raw_hash_sk(struct sock *sk); |
57 | void raw_unhash_sk(struct sock *sk); | 58 | void raw_unhash_sk(struct sock *sk); |
58 | 59 | ||
60 | struct raw_sock { | ||
61 | /* inet_sock has to be the first member */ | ||
62 | struct inet_sock inet; | ||
63 | struct icmp_filter filter; | ||
64 | }; | ||
65 | |||
66 | static inline struct raw_sock *raw_sk(const struct sock *sk) | ||
67 | { | ||
68 | return (struct raw_sock *)sk; | ||
69 | } | ||
70 | |||
59 | #endif /* _RAW_H */ | 71 | #endif /* _RAW_H */ |