Merge branch 'topic/snd_card_new-err' into for-linus

[mv-sheeva.git] / include / net / request_sock.h

diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index 8d6e991ef4dfb79d2a8d75bd14cf4241bafbfc95..c7190846e128e21221106379e619589b3d7f0603 100644 (file)
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -31,9 +31,10 @@ struct request_sock_ops {
        int             family;
        int             obj_size;
        struct kmem_cache       *slab;
+       char            *slab_name;
        int             (*rtx_syn_ack)(struct sock *sk,
                                       struct request_sock *req);
-       void            (*send_ack)(struct sk_buff *skb,
+       void            (*send_ack)(struct sock *sk, struct sk_buff *skb,
                                    struct request_sock *req);
        void            (*send_reset)(struct sock *sk,
                                      struct sk_buff *skb);