summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-01-28 06:06:36 -0800
committerDavid S. Miller <davem@davemloft.net>2015-01-28 23:23:57 -0800
commit86b3bfe914f41c2d47d5882d06e1261cc58fb5e9 (patch)
tree32910ee71e6efd00ef820bc1a84b5b9c6a0bdfd4 /net
parent2dbce096ca3ac18711f72e517ed9674d53310b67 (diff)
downloadlinux-86b3bfe914f41c2d47d5882d06e1261cc58fb5e9.tar.gz
linux-86b3bfe914f41c2d47d5882d06e1261cc58fb5e9.tar.bz2
linux-86b3bfe914f41c2d47d5882d06e1261cc58fb5e9.zip
pkt_sched: fq: remove useless TIME_WAIT check
TIME_WAIT sockets are not owning any skb. ip_send_unicast_reply() and tcp_v6_send_response() both use regular sockets. We can safely remove a test in sch_fq and save one cache line miss, as sk_state is far away from sk_pacing_rate. Tested at Google for about one year. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_fq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 9b05924cc386..2a50f5c62070 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -1,7 +1,7 @@
/*
* net/sched/sch_fq.c Fair Queue Packet Scheduler (per flow pacing)
*
- * Copyright (C) 2013 Eric Dumazet <edumazet@google.com>
+ * Copyright (C) 2013-2015 Eric Dumazet <edumazet@google.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -471,7 +471,7 @@ begin:
goto out;
rate = q->flow_max_rate;
- if (skb->sk && skb->sk->sk_state != TCP_TIME_WAIT)
+ if (skb->sk)
rate = min(skb->sk->sk_pacing_rate, rate);
if (rate != ~0U) {