Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74e49b5 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f87b1dd

include/net/icmp.h

+0 −11
Original line number Diff line number Diff line
@@ -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 */

include/net/raw.h

+12 −0
Original line number Diff line number Diff line
@@ -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 */