Merge tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[pandora-kernel.git] / include / net / ping.h

diff --git a/include/net/ping.h b/include/net/ping.h
index 90f4841..026479b 100644 (file)
--- a/include/net/ping.h
+++ b/include/net/ping.h
@@ -33,8 +33,12 @@
 struct pingv6_ops {
        int (*ipv6_recv_error)(struct sock *sk, struct msghdr *msg, int len,
                               int *addr_len);
-       int (*ip6_datagram_recv_ctl)(struct sock *sk, struct msghdr *msg,
-                                    struct sk_buff *skb);
+       void (*ip6_datagram_recv_common_ctl)(struct sock *sk,
+                                            struct msghdr *msg,
+                                            struct sk_buff *skb);
+       void (*ip6_datagram_recv_specific_ctl)(struct sock *sk,
+                                              struct msghdr *msg,
+                                              struct sk_buff *skb);
        int (*icmpv6_err_convert)(u8 type, u8 code, int *err);
        void (*ipv6_icmp_error)(struct sock *sk, struct sk_buff *skb, int err,
                                __be16 port, u32 info, u8 *payload);
@@ -42,11 +46,6 @@ struct pingv6_ops {
                             const struct net_device *dev, int strict);
 };
 
-struct ping_table {
-       struct hlist_nulls_head hash[PING_HTABLE_SIZE];
-       rwlock_t                lock;
-};
-
 struct ping_iter_state {
        struct seq_net_private  p;
        int                     bucket;
@@ -54,7 +53,6 @@ struct ping_iter_state {
 };
 
 extern struct proto ping_prot;
-extern struct ping_table ping_table;
 #if IS_ENABLED(CONFIG_IPV6)
 extern struct pingv6_ops pingv6_ops;
 #endif
@@ -81,8 +79,6 @@ int  ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                  size_t len, int noblock, int flags, int *addr_len);
 int  ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
                         void *user_icmph, size_t icmph_len);
-int  ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                    size_t len);
 int  ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                     size_t len);
 int  ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);