cfg80211: allow survey data to return global data

[deliverable/linux.git] / net / sched / sch_fq.c

diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index cbd7e1fd23b41bb7ba0bb348c3a1a287652cca93..9b05924cc386ecc2cdb9816be27e439637fb37b3 100644 (file)
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -481,12 +481,11 @@ begin:
                if (likely(rate))
                        do_div(len, rate);
                /* Since socket rate can change later,
-                * clamp the delay to 125 ms.
-                * TODO: maybe segment the too big skb, as in commit
-                * e43ac79a4bc ("sch_tbf: segment too big GSO packets")
+                * clamp the delay to 1 second.
+                * Really, providers of too big packets should be fixed !
                 */
-               if (unlikely(len > 125 * NSEC_PER_MSEC)) {
-                       len = 125 * NSEC_PER_MSEC;
+               if (unlikely(len > NSEC_PER_SEC)) {
+                       len = NSEC_PER_SEC;
                        q->stat_pkts_too_long++;
                }