Merge branch 'master' of /repos/git/net-next-2.6

[safe/jmp/linux-2.6] / include / net / icmp.h

diff --git a/include/net/icmp.h b/include/net/icmp.h
index e34e981..6e991e0 100644 (file)
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -28,13 +28,11 @@ struct icmp_err {
   unsigned     fatal:1;
 };
 
-extern struct icmp_err icmp_err_convert[];
-DECLARE_SNMP_STAT(struct icmp_mib, icmp_statistics);
-DECLARE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
-#define ICMP_INC_STATS(field)          SNMP_INC_STATS(icmp_statistics, field)
-#define ICMP_INC_STATS_BH(field)       SNMP_INC_STATS_BH(icmp_statistics, field)
-#define ICMPMSGOUT_INC_STATS(field)    SNMP_INC_STATS(icmpmsg_statistics, field+256)
-#define ICMPMSGIN_INC_STATS_BH(field)  SNMP_INC_STATS_BH(icmpmsg_statistics, field)
+extern const struct icmp_err icmp_err_convert[];
+#define ICMP_INC_STATS(net, field)     SNMP_INC_STATS((net)->mib.icmp_statistics, field)
+#define ICMP_INC_STATS_BH(net, field)  SNMP_INC_STATS_BH((net)->mib.icmp_statistics, field)
+#define ICMPMSGOUT_INC_STATS(net, field)       SNMP_INC_STATS((net)->mib.icmpmsg_statistics, field+256)
+#define ICMPMSGIN_INC_STATS_BH(net, field)     SNMP_INC_STATS_BH((net)->mib.icmpmsg_statistics, field)
 
 struct dst_entry;
 struct net_proto_family;
@@ -50,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 */