upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / net / tux / input.c

diff --git a/net/tux/input.c b/net/tux/input.c
index d051b50..8d9060b 100644 (file)
--- a/net/tux/input.c
+++ b/net/tux/input.c
@@ -114,7 +114,7 @@ struct dentry * tux_lookup (tux_req_t *req, const char *filename,
                        const unsigned int flag, struct vfsmount **mnt)
 {
        struct dentry *dentry;
-       struct nameidata base;
+       struct nameidata base = {};
 
        Dprintk("tux_lookup(%p, %s, %d, virtual: %d, host: %s (%d).)\n", req, filename, flag, req->virtual, req->host, req->host_len);
 
@@ -396,7 +396,7 @@ void print_req (tux_req_t *req)
                printk("...tp->send_head: %p\n", sk->sk_send_head);
                printk("...tp->snd_una: %08x\n", tcp_sk(sk)->snd_una);
                printk("...tp->snd_nxt: %08x\n", tcp_sk(sk)->snd_nxt);
-               printk("...tp->packets_out: %08x\n", tcp_get_pcount(&tcp_sk(sk)->packets_out));
+               printk("...tp->packets_out: %08x\n", tcp_sk(sk)->packets_out);
        }
        printk("... meth:{%s}, uri:{%s}, query:{%s}, ver:{%s}\n", req->method_str ? req->method_str : "<null>", req->uri_str ? req->uri_str : "<null>", req->query_str ? req->query_str : "<null>", req->version_str ? req->version_str : "<null>");
        printk("... post_data:{%s}(%d).\n", req->post_data_str, req->post_data_len);
@@ -413,7 +413,7 @@ void parse_request (tux_req_t *req, int cachemiss)
 {
        int len, parsed_len;
        struct sock *sk = req->sock->sk;
-       struct tcp_opt *tp = tcp_sk(sk);
+       struct tcp_sock *tp = tcp_sk(sk);
        int was_keepalive = req->keep_alive;
 
        if (req->magic != TUX_MAGIC)