Merge branch 'master'

16 files changed, 77 insertions, 105 deletions

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index e7d26d9943c2..8ce0ce2ee48e 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -71,7 +71,7 @@ struct ipfrag_skb_cb
 
 /* Describe an entry in the "incomplete datagrams" queue. */
 struct ipq {
-        struct ipq      *next;          /* linked list pointers                 */
+        struct hlist_node list;
         struct list_head lru_list;      /* lru list member                      */
         u32             user;
         u32             saddr;
@@ -89,7 +89,6 @@ struct ipq {
         spinlock_t      lock;
         atomic_t        refcnt;
         struct timer_list timer;        /* when will this queue expire?         */
-        struct ipq      **pprev;
         int             iif;
         struct timeval  stamp;
 };
@@ -99,7 +98,7 @@ struct ipq {
 #define IPQ_HASHSZ      64
 
 /* Per-bucket lock is easy to add now. */
-static struct ipq *ipq_hash[IPQ_HASHSZ];
+static struct hlist_head ipq_hash[IPQ_HASHSZ];
 static DEFINE_RWLOCK(ipfrag_lock);
 static u32 ipfrag_hash_rnd;
 static LIST_HEAD(ipq_lru_list);
@@ -107,9 +106,7 @@ int ip_frag_nqueues = 0;
 
 static __inline__ void __ipq_unlink(struct ipq *qp)
 {
-        if(qp->next)
-                qp->next->pprev = qp->pprev;
-        *qp->pprev = qp->next;
+        hlist_del(&qp->list);
         list_del(&qp->lru_list);
         ip_frag_nqueues--;
 }
@@ -139,27 +136,18 @@ static void ipfrag_secret_rebuild(unsigned long dummy)
         get_random_bytes(&ipfrag_hash_rnd, sizeof(u32));
         for (i = 0; i < IPQ_HASHSZ; i++) {
                 struct ipq *q;
+                struct hlist_node *p, *n;
 
-                q = ipq_hash[i];
-                while (q) {
-                        struct ipq *next = q->next;
+                hlist_for_each_entry_safe(q, p, n, &ipq_hash[i], list) {
                         unsigned int hval = ipqhashfn(q->id, q->saddr,
                                                       q->daddr, q->protocol);
 
                         if (hval != i) {
-                                /* Unlink. */
-                                if (q->next)
-                                        q->next->pprev = q->pprev;
-                                *q->pprev = q->next;
+                                hlist_del(&q->list);
 
                                 /* Relink to new hash chain. */
-                                if ((q->next = ipq_hash[hval]) != NULL)
-                                        q->next->pprev = &q->next;
-                                ipq_hash[hval] = q;
-                                q->pprev = &ipq_hash[hval];
+                                hlist_add_head(&q->list, &ipq_hash[hval]);
                         }
-
-                        q = next;
                 }
         }
         write_unlock(&ipfrag_lock);
@@ -310,14 +298,16 @@ out:
 static struct ipq *ip_frag_intern(unsigned int hash, struct ipq *qp_in)
 {
         struct ipq *qp;
-
+#ifdef CONFIG_SMP
+        struct hlist_node *n;
+#endif
         write_lock(&ipfrag_lock);
 #ifdef CONFIG_SMP
         /* With SMP race we have to recheck hash table, because
          * such entry could be created on other cpu, while we
          * promoted read lock to write lock.
          */
-        for(qp = ipq_hash[hash]; qp; qp = qp->next) {
+        hlist_for_each_entry(qp, n, &ipq_hash[hash], list) {
                 if(qp->id == qp_in->id          &&
                    qp->saddr == qp_in->saddr    &&
                    qp->daddr == qp_in->daddr    &&
@@ -337,10 +327,7 @@ static struct ipq *ip_frag_intern(unsigned int hash, struct ipq *qp_in)
                 atomic_inc(&qp->refcnt);
 
         atomic_inc(&qp->refcnt);
-        if((qp->next = ipq_hash[hash]) != NULL)
-                qp->next->pprev = &qp->next;
-        ipq_hash[hash] = qp;
-        qp->pprev = &ipq_hash[hash];
+        hlist_add_head(&qp->list, &ipq_hash[hash]);
         INIT_LIST_HEAD(&qp->lru_list);
         list_add_tail(&qp->lru_list, &ipq_lru_list);
         ip_frag_nqueues++;
@@ -392,9 +379,10 @@ static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
         __u8 protocol = iph->protocol;
         unsigned int hash = ipqhashfn(id, saddr, daddr, protocol);
         struct ipq *qp;
+        struct hlist_node *n;
 
         read_lock(&ipfrag_lock);
-        for(qp = ipq_hash[hash]; qp; qp = qp->next) {
+        hlist_for_each_entry(qp, n, &ipq_hash[hash], list) {
                 if(qp->id == id         &&
                    qp->saddr == saddr   &&
                    qp->daddr == daddr   &&
diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
index d77d6b3f5f80..59e12b02b22c 100644
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
@@ -29,9 +29,9 @@ static char *ftp_buffer;
 static DEFINE_SPINLOCK(ip_ftp_lock);
 
 #define MAX_PORTS 8
-static short ports[MAX_PORTS];
+static unsigned short ports[MAX_PORTS];
 static int ports_c;
-module_param_array(ports, short, &ports_c, 0400);
+module_param_array(ports, ushort, &ports_c, 0400);
 
 static int loose;
 module_param(loose, int, 0600);
diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c
index 15457415a4f3..2dea1db14406 100644
--- a/net/ipv4/netfilter/ip_conntrack_irc.c
+++ b/net/ipv4/netfilter/ip_conntrack_irc.c
@@ -34,7 +34,7 @@
 #include <linux/moduleparam.h>
 
 #define MAX_PORTS 8
-static short ports[MAX_PORTS];
+static unsigned short ports[MAX_PORTS];
 static int ports_c;
 static int max_dcc_channels = 8;
 static unsigned int dcc_timeout = 300;
@@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(ip_nat_irc_hook);
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");
 MODULE_LICENSE("GPL");
-module_param_array(ports, short, &ports_c, 0400);
+module_param_array(ports, ushort, &ports_c, 0400);
 MODULE_PARM_DESC(ports, "port numbers of IRC servers");
 module_param(max_dcc_channels, int, 0400);
 MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per IRC session");
diff --git a/net/ipv4/netfilter/ip_conntrack_tftp.c b/net/ipv4/netfilter/ip_conntrack_tftp.c
index a78736b8525d..d3c5a371f993 100644
--- a/net/ipv4/netfilter/ip_conntrack_tftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -26,9 +26,9 @@ MODULE_DESCRIPTION("tftp connection tracking helper");
 MODULE_LICENSE("GPL");
 
 #define MAX_PORTS 8
-static short ports[MAX_PORTS];
+static unsigned short ports[MAX_PORTS];
 static int ports_c;
-module_param_array(ports, short, &ports_c, 0400);
+module_param_array(ports, ushort, &ports_c, 0400);
 MODULE_PARM_DESC(ports, "port numbers of tftp servers");
 
 #if 0
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c
index 82b3c189bd7d..63cf7e540847 100644
--- a/net/ipv4/tcp_highspeed.c
+++ b/net/ipv4/tcp_highspeed.c
@@ -111,7 +111,7 @@ static void hstcp_init(struct sock *sk)
 }
 
 static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt,
-                             u32 in_flight, u32 pkts_acked)
+                             u32 in_flight, int data_acked)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct hstcp *ca = inet_csk_ca(sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 40a26b7157b4..bf2e23086bce 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -367,7 +367,7 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep)
                  * are stalled on filesystem I/O.
                  *
                  * Also, since we are only going for a minimum in the
-                 * non-timestamp case, we do not smoother things out
+                 * non-timestamp case, we do not smooth things out
                  * else with timestamps disabled convergence takes too
                  * long.
                  */
@@ -546,7 +546,7 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt)
          *
          * Funny. This algorithm seems to be very broken.
          * These formulae increase RTO, when it should be decreased, increase
-         * too slowly, when it should be increased fastly, decrease too fastly
+         * too slowly, when it should be increased quickly, decrease too quickly
          * etc. I guess in BSD RTO takes ONE value, so that it is absolutely
          * does not matter how to _calculate_ it. Seems, it was trap
          * that VJ failed to avoid. 8)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ddcf7754eec2..56a09a4ac410 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1045,9 +1045,10 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
                         }
 #endif
                         /* Rule 8: Use longest matching prefix */
-                        if (hiscore.rule < 8)
+                        if (hiscore.rule < 8) {
                                 hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);
-                        score.rule++;
+                                hiscore.rule++;
+                        }
                         score.matchlen = ipv6_addr_diff(&ifa->addr, daddr);
                         if (score.matchlen > hiscore.matchlen) {
                                 score.rule = 8;
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 003fd99ff597..25757ade989f 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -287,7 +287,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname,
         {
                 struct ipv6_txoptions *opt;
                 if (optlen == 0)
-                        optval = 0;
+                        optval = NULL;
 
                 /* hop-by-hop / destination options are privileged option */
                 retv = -EPERM;
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index e4fe9ee484dd..5d316cb72ec9 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -74,7 +74,7 @@ struct ip6frag_skb_cb
 
 struct frag_queue
 {
-        struct frag_queue       *next;
+        struct hlist_node       list;
         struct list_head lru_list;              /* lru list member      */
 
         __u32                   id;             /* fragment id          */
@@ -95,14 +95,13 @@ struct frag_queue
 #define FIRST_IN                2
 #define LAST_IN                 1
         __u16                   nhoffset;
-        struct frag_queue       **pprev;
 };
 
 /* Hash table. */
 
 #define IP6Q_HASHSZ     64
 
-static struct frag_queue *ip6_frag_hash[IP6Q_HASHSZ];
+static struct hlist_head ip6_frag_hash[IP6Q_HASHSZ];
 static DEFINE_RWLOCK(ip6_frag_lock);
 static u32 ip6_frag_hash_rnd;
 static LIST_HEAD(ip6_frag_lru_list);
@@ -110,9 +109,7 @@ int ip6_frag_nqueues = 0;
 
 static __inline__ void __fq_unlink(struct frag_queue *fq)
 {
-        if(fq->next)
-                fq->next->pprev = fq->pprev;
-        *fq->pprev = fq->next;
+        hlist_del(&fq->list);
         list_del(&fq->lru_list);
         ip6_frag_nqueues--;
 }
@@ -163,28 +160,21 @@ static void ip6_frag_secret_rebuild(unsigned long dummy)
         get_random_bytes(&ip6_frag_hash_rnd, sizeof(u32));
         for (i = 0; i < IP6Q_HASHSZ; i++) {
                 struct frag_queue *q;
+                struct hlist_node *p, *n;
 
-                q = ip6_frag_hash[i];
-                while (q) {
-                        struct frag_queue *next = q->next;
+                hlist_for_each_entry_safe(q, p, n, &ip6_frag_hash[i], list) {
                         unsigned int hval = ip6qhashfn(q->id,
                                                        &q->saddr,
                                                        &q->daddr);
 
                         if (hval != i) {
-                                /* Unlink. */
-                                if (q->next)
-                                        q->next->pprev = q->pprev;
-                                *q->pprev = q->next;
+                                hlist_del(&q->list);
 
                                 /* Relink to new hash chain. */
-                                if ((q->next = ip6_frag_hash[hval]) != NULL)
-                                        q->next->pprev = &q->next;
-                                ip6_frag_hash[hval] = q;
-                                q->pprev = &ip6_frag_hash[hval];
-                        }
+                                hlist_add_head(&q->list,
+                                               &ip6_frag_hash[hval]);
 
-                        q = next;
+                        }
                 }
         }
         write_unlock(&ip6_frag_lock);
@@ -337,10 +327,13 @@ static struct frag_queue *ip6_frag_intern(unsigned int hash,
                                           struct frag_queue *fq_in)
 {
         struct frag_queue *fq;
+#ifdef CONFIG_SMP
+        struct hlist_node *n;
+#endif
 
         write_lock(&ip6_frag_lock);
 #ifdef CONFIG_SMP
-        for (fq = ip6_frag_hash[hash]; fq; fq = fq->next) {
+        hlist_for_each_entry(fq, n, &ip6_frag_hash[hash], list) {
                 if (fq->id == fq_in->id && 
                     ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&
                     ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {
@@ -358,10 +351,7 @@ static struct frag_queue *ip6_frag_intern(unsigned int hash,
                 atomic_inc(&fq->refcnt);
 
         atomic_inc(&fq->refcnt);
-        if((fq->next = ip6_frag_hash[hash]) != NULL)
-                fq->next->pprev = &fq->next;
-        ip6_frag_hash[hash] = fq;
-        fq->pprev = &ip6_frag_hash[hash];
+        hlist_add_head(&fq->list, &ip6_frag_hash[hash]);
         INIT_LIST_HEAD(&fq->lru_list);
         list_add_tail(&fq->lru_list, &ip6_frag_lru_list);
         ip6_frag_nqueues++;
@@ -401,10 +391,11 @@ static __inline__ struct frag_queue *
 fq_find(u32 id, struct in6_addr *src, struct in6_addr *dst)
 {
         struct frag_queue *fq;
+        struct hlist_node *n;
         unsigned int hash = ip6qhashfn(id, src, dst);
 
         read_lock(&ip6_frag_lock);
-        for(fq = ip6_frag_hash[hash]; fq; fq = fq->next) {
+        hlist_for_each_entry(fq, n, &ip6_frag_hash[hash], list) {
                 if (fq->id == id && 
                     ipv6_addr_equal(src, &fq->saddr) &&
                     ipv6_addr_equal(dst, &fq->daddr)) {
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 9a71a8d1078a..a7a537b50595 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1732,7 +1732,7 @@ int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
                 /*
                  * 2. allocate and initialize walker.
                  */
-                w = kmalloc(sizeof(*w), GFP_KERNEL);
+                w = kmalloc(sizeof(*w), GFP_ATOMIC);
                 if (w == NULL)
                         return -ENOMEM;
                 RT6_TRACE("dump<%p", w);
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 59d02cbbeb9e..c3f0b0783453 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -116,7 +116,9 @@ static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock)
         struct llc_sock* llc = llc_sk(sk);
         int rc = 0;
 
-        if (unlikely(llc_data_accept_state(llc->state) || llc->p_flag)) {
+        if (unlikely(llc_data_accept_state(llc->state) || 
+                     llc->remote_busy_flag ||
+                     llc->p_flag)) {
                 long timeout = sock_sndtimeo(sk, noblock);
 
                 rc = llc_ui_wait_for_busy_core(sk, timeout);
@@ -542,6 +544,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout)
                 if (sk_wait_event(sk, &timeout,
                                   (sk->sk_shutdown & RCV_SHUTDOWN) ||
                                   (!llc_data_accept_state(llc->state) &&
+                                   !llc->remote_busy_flag &&
                                    !llc->p_flag)))
                         break;
                 rc = -ERESTARTSYS;
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index b0bcfb1f12dd..8169f24ed33e 100644
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -866,7 +866,8 @@ int llc_conn_ac_send_ack_if_needed(struct sock *sk, struct sk_buff *skb)
                 llc->ack_must_be_send = 1;
                 llc->ack_pf = pf_bit & 1;
         }
-        if (((llc->vR - llc->first_pdu_Ns + 129) % 128) >= llc->npta) {
+        if (((llc->vR - llc->first_pdu_Ns + 1 + LLC_2_SEQ_NBR_MODULO)
+                        % LLC_2_SEQ_NBR_MODULO) >= llc->npta) {
                 llc_conn_ac_send_rr_rsp_f_set_ackpf(sk, skb);
                 llc->ack_must_be_send   = 0;
                 llc->ack_pf             = 0;
@@ -994,8 +995,8 @@ static int llc_conn_ac_inc_npta_value(struct sock *sk, struct sk_buff *skb)
                 llc->dec_step = 0;
                 llc->dec_cntr = llc->inc_cntr = 2;
                 ++llc->npta;
-                if (llc->npta > 127)
-                        llc->npta = 127 ;
+                if (llc->npta > (u8) ~LLC_2_SEQ_NBR_MODULO)
+                        llc->npta = (u8) ~LLC_2_SEQ_NBR_MODULO;
         } else
                 --llc->inc_cntr;
         return 0;
@@ -1065,9 +1066,10 @@ int llc_conn_ac_dec_tx_win_size(struct sock *sk, struct sk_buff *skb)
         struct llc_sock *llc = llc_sk(sk);
         u8 unacked_pdu = skb_queue_len(&llc->pdu_unack_q);
 
-        llc->k -= unacked_pdu;
-        if (llc->k < 2)
-                llc->k = 2;
+        if (llc->k - unacked_pdu < 1)
+                llc->k = 1;
+        else
+                llc->k -= unacked_pdu;
         return 0;
 }
 
@@ -1084,8 +1086,8 @@ int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb)
         struct llc_sock *llc = llc_sk(sk);
 
         llc->k += 1;
-        if (llc->k > 128)
-                llc->k = 128 ;
+        if (llc->k > (u8) ~LLC_2_SEQ_NBR_MODULO)
+                llc->k = (u8) ~LLC_2_SEQ_NBR_MODULO;
         return 0;
 }
 
@@ -1309,7 +1311,7 @@ int llc_conn_ac_set_vs_nr(struct sock *sk, struct sk_buff *skb)
 
 static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb)
 {
-        llc_sk(sk)->vS = (llc_sk(sk)->vS + 1) % 128;
+        llc_sk(sk)->vS = (llc_sk(sk)->vS + 1) % LLC_2_SEQ_NBR_MODULO;
         return 0;
 }
 
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 9a67c796b385..1da678303d78 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -387,7 +387,7 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
 static void nf_ct_unlink_expect(struct nf_conntrack_expect *exp)
 {
         ASSERT_WRITE_LOCK(&nf_conntrack_lock);
-        NF_CT_ASSERT(!timer_pending(&exp_timeout));
+        NF_CT_ASSERT(!timer_pending(&exp->timeout));
         list_del(&exp->list);
         NF_CT_STAT_INC(expect_delete);
         exp->master->expecting--;
@@ -1395,6 +1395,13 @@ void nf_conntrack_cleanup(void)
         kmem_cache_destroy(nf_conntrack_expect_cachep);
         free_conntrack_hash(nf_conntrack_hash, nf_conntrack_vmalloc,
                             nf_conntrack_htable_size);
+
+        /* free l3proto protocol tables */
+        for (i = 0; i < PF_MAX; i++)
+                if (nf_ct_protos[i]) {
+                        kfree(nf_ct_protos[i]);
+                        nf_ct_protos[i] = NULL;
+                }
 }
 
 static struct list_head *alloc_hashtable(int size, int *vmalloced)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 45224db4fe2f..5af381f9fe3d 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -694,7 +694,7 @@ static int init_or_cleanup(int init)
  cleanup_proc_stat:
 #endif
 #ifdef CONFIG_PROC_FS
-        proc_net_remove("nf_conntrack_stat");
+        remove_proc_entry("nf_conntrack", proc_net_stat);
  cleanup_proc_exp:
         proc_net_remove("nf_conntrack_expect");
  cleanup_proc:
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 7f34e7fd767c..55cd5327fbd7 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -40,9 +40,10 @@ config NET_SCHED
           The available schedulers are listed in the following questions; you
           can say Y to as many as you like. If unsure, say N now.
 
+if NET_SCHED
+
 choice
         prompt "Packet scheduler clock source"
-        depends on NET_SCHED
         default NET_SCH_CLK_JIFFIES
         ---help---
           Packet schedulers need a monotonic clock that increments at a static
@@ -98,11 +99,9 @@ config NET_SCH_CLK_CPU
 endchoice
 
 comment "Queueing/Scheduling"
-        depends on NET_SCHED
 
 config NET_SCH_CBQ
         tristate "Class Based Queueing (CBQ)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the Class-Based Queueing (CBQ) packet
           scheduling algorithm. This algorithm classifies the waiting packets
@@ -120,7 +119,6 @@ config NET_SCH_CBQ
 
 config NET_SCH_HTB
         tristate "Hierarchical Token Bucket (HTB)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the Hierarchical Token Buckets (HTB)
           packet scheduling algorithm. See
@@ -135,7 +133,6 @@ config NET_SCH_HTB
 
 config NET_SCH_HFSC
         tristate "Hierarchical Fair Service Curve (HFSC)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the Hierarchical Fair Service Curve
           (HFSC) packet scheduling algorithm.
@@ -145,7 +142,7 @@ config NET_SCH_HFSC
 
 config NET_SCH_ATM
         tristate "ATM Virtual Circuits (ATM)"
-        depends on NET_SCHED && ATM
+        depends on ATM
         ---help---
           Say Y here if you want to use the ATM pseudo-scheduler.  This
           provides a framework for invoking classifiers, which in turn
@@ -159,7 +156,6 @@ config NET_SCH_ATM
 
 config NET_SCH_PRIO
         tristate "Multi Band Priority Queueing (PRIO)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use an n-band priority queue packet
           scheduler.
@@ -169,7 +165,6 @@ config NET_SCH_PRIO
 
 config NET_SCH_RED
         tristate "Random Early Detection (RED)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the Random Early Detection (RED)
           packet scheduling algorithm.
@@ -181,7 +176,6 @@ config NET_SCH_RED
 
 config NET_SCH_SFQ
         tristate "Stochastic Fairness Queueing (SFQ)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the Stochastic Fairness Queueing (SFQ)
           packet scheduling algorithm .
@@ -193,7 +187,6 @@ config NET_SCH_SFQ
 
 config NET_SCH_TEQL
         tristate "True Link Equalizer (TEQL)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the True Link Equalizer (TLE) packet
           scheduling algorithm. This queueing discipline allows the combination
@@ -206,7 +199,6 @@ config NET_SCH_TEQL
 
 config NET_SCH_TBF
         tristate "Token Bucket Filter (TBF)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the Token Bucket Filter (TBF) packet
           scheduling algorithm.
@@ -218,7 +210,6 @@ config NET_SCH_TBF
 
 config NET_SCH_GRED
         tristate "Generic Random Early Detection (GRED)"
-        depends on NET_SCHED
         ---help---
           Say Y here if you want to use the Generic Random Early Detection
           (GRED) packet scheduling algorithm for some of your network devices
@@ -230,7 +221,6 @@ config NET_SCH_GRED
 
 config NET_SCH_DSMARK
         tristate "Differentiated Services marker (DSMARK)"
-        depends on NET_SCHED
         ---help---
           Say Y if you want to schedule packets according to the
           Differentiated Services architecture proposed in RFC 2475.
@@ -242,7 +232,6 @@ config NET_SCH_DSMARK
 
 config NET_SCH_NETEM
         tristate "Network emulator (NETEM)"
-        depends on NET_SCHED
         ---help---
           Say Y if you want to emulate network delay, loss, and packet
           re-ordering. This is often useful to simulate networks when
@@ -255,7 +244,6 @@ config NET_SCH_NETEM
 
 config NET_SCH_INGRESS
         tristate "Ingress Qdisc"
-        depends on NET_SCHED 
         ---help---
           Say Y here if you want to use classifiers for incoming packets.
           If unsure, say Y.
@@ -264,14 +252,12 @@ config NET_SCH_INGRESS
           module will be called sch_ingress.
 
 comment "Classification"
-        depends on NET_SCHED
 
 config NET_CLS
         boolean
 
 config NET_CLS_BASIC
         tristate "Elementary classification (BASIC)"
-        depends NET_SCHED
         select NET_CLS
         ---help---
           Say Y here if you want to be able to classify packets using
@@ -282,7 +268,6 @@ config NET_CLS_BASIC
 
 config NET_CLS_TCINDEX
         tristate "Traffic-Control Index (TCINDEX)"
-        depends NET_SCHED
         select NET_CLS
         ---help---
           Say Y here if you want to be able to classify packets based on
@@ -294,7 +279,6 @@ config NET_CLS_TCINDEX
 
 config NET_CLS_ROUTE4
         tristate "Routing decision (ROUTE)"
-        depends NET_SCHED
         select NET_CLS_ROUTE
         select NET_CLS
         ---help---
@@ -306,11 +290,9 @@ config NET_CLS_ROUTE4
 
 config NET_CLS_ROUTE
         bool
-        default n
 
 config NET_CLS_FW
         tristate "Netfilter mark (FW)"
-        depends NET_SCHED
         select NET_CLS
         ---help---
           If you say Y here, you will be able to classify packets
@@ -321,7 +303,6 @@ config NET_CLS_FW
 
 config NET_CLS_U32
         tristate "Universal 32bit comparisons w/ hashing (U32)"
-        depends NET_SCHED
         select NET_CLS
         ---help---
           Say Y here to be able to classify packetes using a universal
@@ -345,7 +326,6 @@ config CLS_U32_MARK
 
 config NET_CLS_RSVP
         tristate "IPv4 Resource Reservation Protocol (RSVP)"
-        depends on NET_SCHED
         select NET_CLS
         select NET_ESTIMATOR
         ---help---
@@ -361,7 +341,6 @@ config NET_CLS_RSVP
 
 config NET_CLS_RSVP6
         tristate "IPv6 Resource Reservation Protocol (RSVP6)"
-        depends on NET_SCHED
         select NET_CLS
         select NET_ESTIMATOR
         ---help---
@@ -377,7 +356,6 @@ config NET_CLS_RSVP6
 
 config NET_EMATCH
         bool "Extended Matches"
-        depends NET_SCHED
         select NET_CLS
         ---help---
           Say Y here if you want to use extended matches on top of classifiers
@@ -456,7 +434,7 @@ config NET_EMATCH_TEXT
 
 config NET_CLS_ACT
         bool "Actions"
-        depends on EXPERIMENTAL && NET_SCHED
+        depends on EXPERIMENTAL
         select NET_ESTIMATOR
         ---help---
           Say Y here if you want to use traffic control actions. Actions
@@ -539,7 +517,7 @@ config NET_ACT_SIMP
 
 config NET_CLS_POLICE
         bool "Traffic Policing (obsolete)"
-        depends on NET_SCHED && NET_CLS_ACT!=y
+        depends on NET_CLS_ACT!=y
         select NET_ESTIMATOR
         ---help---
           Say Y here if you want to do traffic policing, i.e. strict
@@ -549,7 +527,7 @@ config NET_CLS_POLICE
 
 config NET_CLS_IND
         bool "Incoming device classification"
-        depends on NET_SCHED && (NET_CLS_U32 || NET_CLS_FW)
+        depends on NET_CLS_U32 || NET_CLS_FW
         ---help---
           Say Y here to extend the u32 and fw classifier to support
           classification based on the incoming device. This option is
@@ -557,11 +535,12 @@ config NET_CLS_IND
 
 config NET_ESTIMATOR
         bool "Rate estimator"
-        depends on NET_SCHED
         ---help---
           Say Y here to allow using rate estimators to estimate the current
           rate-of-flow for network devices, queues, etc. This module is
           automaticaly selected if needed but can be selected manually for
           statstical purposes.
 
+endif # NET_SCHED
+
 endmenu
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index e50e7cf43737..c6a51911e71e 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1178,6 +1178,7 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout)
         arg->tail[0].iov_len = 0;
 
         try_to_freeze();
+        cond_resched();
         if (signalled())
                 return -EINTR;