Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0...

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

diff --git a/net/tux/input.c b/net/tux/input.c
index 8d9060b..28cebcb 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);
 
@@ -277,10 +277,10 @@ static int read_request (struct socket *sock, char *buf, int max_size)
        msg.msg_control  = NULL;
        msg.msg_controllen = 0;
        msg.msg_flags    = 0;
-       
+
        msg.msg_iov->iov_base = buf;
        msg.msg_iov->iov_len  = max_size;
-       
+
        oldmm = get_fs(); set_fs(KERNEL_DS);
 
 read_again:
@@ -327,7 +327,7 @@ static int zap_urg_data (struct socket *sock)
        msg.msg_control         = NULL;
        msg.msg_controllen      = 0;
        msg.msg_flags           = 0;
-       
+
        msg.msg_iov->iov_base = buf;
        msg.msg_iov->iov_len  = 2;
 
@@ -402,7 +402,7 @@ void print_req (tux_req_t *req)
        printk("... post_data:{%s}(%d).\n", req->post_data_str, req->post_data_len);
        printk("... headers: {%s}\n", req->headers);
 }
-/* 
+/*
  * parse_request() reads all available TCP/IP data and prepares
  * the request if the TUX request is complete. (we can get TUX
  * requests in several packets.) Invalid requests are redirected
@@ -414,6 +414,7 @@ void parse_request (tux_req_t *req, int cachemiss)
        int len, parsed_len;
        struct sock *sk = req->sock->sk;
        struct tcp_sock *tp = tcp_sk(sk);
+       struct inet_connection_sock *icsk = inet_csk(sk);
        int was_keepalive = req->keep_alive;
 
        if (req->magic != TUX_MAGIC)
@@ -476,8 +477,8 @@ restart:
                 */
                if (was_keepalive) {
                        lock_sock(sk);
-                       tp->ack.pingpong = 0;
-                       tp->ack.pending |= TCP_ACK_PUSHED;
+                       icsk->icsk_ack.pingpong = 0;
+                       icsk->icsk_ack.pending |= ICSK_ACK_PUSHED;
                        cleanup_rbuf(sk, 1);
                        release_sock(sk);
                }
@@ -535,7 +536,7 @@ restart_loop:
        spin_lock_irq(&ti->work_lock);
        head = &ti->work_pending;
        curr = head->next;
-       
+
        if (curr != head) {
                int i;
 
@@ -597,7 +598,7 @@ restart:
                DEBUG_DEL_LIST(curr);
                DEC_STAT(nr_input_pending);
                spin_unlock_irq(&ti->work_lock);
-#if CONFIG_TUX_DEBUG
+#ifdef CONFIG_TUX_DEBUG
                req->bytes_expected = 0;
 #endif
                req->in_file->f_pos = 0;