[NET] rules: Protocol independant mark selector

[linux-2.6-omap-h63xx.git] / include / net / request_sock.h

diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index b52cc52ffe39f1475488c0d904753519a6df531f..f743a941a4f243d618fcb55c76d7f71b750a5669 100644 (file)
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -53,6 +53,8 @@ struct request_sock {
        unsigned long                   expires;
        struct request_sock_ops         *rsk_ops;
        struct sock                     *sk;
+       u32                             secid;
+       u32                             peer_secid;
 };
 
 static inline struct request_sock *reqsk_alloc(struct request_sock_ops *ops)
@@ -145,7 +147,7 @@ static inline struct request_sock *
 {
        struct request_sock *req = queue->rskq_accept_head;
 
-       queue->rskq_accept_head = queue->rskq_accept_head = NULL;
+       queue->rskq_accept_head = NULL;
        return req;
 }
 
@@ -244,7 +246,7 @@ static inline int reqsk_queue_is_full(const struct request_sock_queue *queue)
 
 static inline void reqsk_queue_hash_req(struct request_sock_queue *queue,
                                        u32 hash, struct request_sock *req,
-                                       unsigned timeout)
+                                       unsigned long timeout)
 {
        struct listen_sock *lopt = queue->listen_opt;