Removed CKRM code base from kernel tree.

[linux-2.6.git] / net / ipv4 / tcp_ipv4.c

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 2b2fab3..8034ab5 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -919,11 +919,7 @@ static void tcp_v4_synq_add(struct sock *sk, struct open_request *req)
        lopt->syn_table[h] = req;
        write_unlock(&tp->syn_wait_lock);
 
-#ifdef CONFIG_ACCEPT_QUEUES
-       tcp_synq_added(sk, req);
-#else
        tcp_synq_added(sk);
-#endif
 }
 
 
@@ -1416,9 +1412,6 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        __u32 daddr = skb->nh.iph->daddr;
        __u32 isn = TCP_SKB_CB(skb)->when;
        struct dst_entry *dst = NULL;
-#ifdef CONFIG_ACCEPT_QUEUES
-       int class = 0;
-#endif
 #ifdef CONFIG_SYN_COOKIES
        int want_cookie = 0;
 #else
@@ -1443,31 +1436,12 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                goto drop;
        }
 
-#ifdef CONFIG_ACCEPT_QUEUES
-       class = (skb->nfmark <= 0) ? 0 :
-               ((skb->nfmark >= NUM_ACCEPT_QUEUES) ? 0: skb->nfmark);
-       /*
-        * Accept only if the class has shares set or if the default class
-        * i.e. class 0 has shares
-        */
-       if (!(tcp_sk(sk)->acceptq[class].aq_ratio)) {
-               if (tcp_sk(sk)->acceptq[0].aq_ratio) 
-                       class = 0;
-               else
-                       goto drop;
-       }
-#endif
-
        /* Accept backlog is full. If we have already queued enough
         * of warm entries in syn queue, drop request. It is better than
         * clogging syn queue with openreqs with exponentially increasing
         * timeout.
         */
-#ifdef CONFIG_ACCEPT_QUEUES
-       if (sk_acceptq_is_full(sk, class) && tcp_synq_young(sk, class) > 1)
-#else
        if (sk_acceptq_is_full(sk) && tcp_synq_young(sk) > 1)
-#endif
                goto drop;
 
        req = tcp_openreq_alloc();
@@ -1497,10 +1471,6 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        tp.tstamp_ok = tp.saw_tstamp;
 
        tcp_openreq_init(req, &tp, skb);
-#ifdef CONFIG_ACCEPT_QUEUES
-       req->acceptq_class = class;
-       req->acceptq_time_stamp = jiffies;
-#endif
        req->af.v4_req.loc_addr = daddr;
        req->af.v4_req.rmt_addr = saddr;
        req->af.v4_req.opt = tcp_v4_save_options(sk, skb);
@@ -1595,11 +1565,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
        struct tcp_opt *newtp;
        struct sock *newsk;
 
-#ifdef CONFIG_ACCEPT_QUEUES
-       if (sk_acceptq_is_full(sk, req->acceptq_class))
-#else
        if (sk_acceptq_is_full(sk))
-#endif
                goto exit_overflow;
 
        if (!dst && (dst = tcp_v4_route_req(sk, req)) == NULL)