diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-13 05:03:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 14:49:31 -0700 |
| commit | f74e49b5613206fb18468bdc9509a1db746aa01b (patch) | |
| tree | 2b45092158d7df385822fd1e21a5433f7ffdb8d1 | |
| parent | 0f87b1dd01b51dc3c789f7a212656a4a87eee1bd (diff) | |
| download | linux-f74e49b5613206fb18468bdc9509a1db746aa01b.tar.gz linux-f74e49b5613206fb18468bdc9509a1db746aa01b.tar.bz2 linux-f74e49b5613206fb18468bdc9509a1db746aa01b.zip | |
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>
| -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); /* 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 6c14a656357a..67cc64369432 100644 --- 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 */ |