Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f74e49b5613206fb18468bdc9509a1db746aa01b

Authored by Patrick McHardy
Committed by David S. Miller
1 parent 0f87b1dd01
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 2 changed files with 12 additions and 11 deletions Side-by-side Diff

... ... @@ -48,16 +48,5 @@
48 48 /* Move into dst.h ? */
49 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 51 #endif /* _ICMP_H */
... ... @@ -19,6 +19,7 @@
19 19  
20 20  
21 21 #include <net/protocol.h>
  22 +#include <linux/icmp.h>
22 23  
23 24 extern struct proto raw_prot;
24 25  
... ... @@ -55,6 +56,17 @@
55 56  
56 57 void raw_hash_sk(struct sock *sk);
57 58 void raw_unhash_sk(struct sock *sk);
  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 +}
58 70  
59 71 #endif /* _RAW_H */