summaryrefslogtreecommitdiffstats
path: root/net/sched/sch_tbf.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-06-09 00:27:41 +0200
committerDavid S. Miller <davem@davemloft.net>2016-06-08 23:58:51 -0700
commitc3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2 (patch)
tree52e2931588e37db52cafb4ec79e08579609e20a8 /net/sched/sch_tbf.c
parentdd47c1fa776cda48531b651c88341e951140b0a7 (diff)
downloadlinux-c3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2.tar.gz
linux-c3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2.tar.bz2
linux-c3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2.zip
sched: remove qdisc_rehape_fail
After the removal of TCA_CBQ_POLICE in cbq scheduler qdisc->reshape_fail is always NULL, i.e. qdisc_rehape_fail is now the same as qdisc_drop. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_tbf.c')
-rw-r--r--net/sched/sch_tbf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 83b90b584fae..801148c8b6ac 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -166,7 +166,7 @@ static int tbf_segment(struct sk_buff *skb, struct Qdisc *sch)
segs = skb_gso_segment(skb, features & ~NETIF_F_GSO_MASK);
if (IS_ERR_OR_NULL(segs))
- return qdisc_reshape_fail(skb, sch);
+ return qdisc_drop(skb, sch);
nb = 0;
while (segs) {
@@ -198,7 +198,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch)
if (qdisc_pkt_len(skb) > q->max_size) {
if (skb_is_gso(skb) && skb_gso_mac_seglen(skb) <= q->max_size)
return tbf_segment(skb, sch);
- return qdisc_reshape_fail(skb, sch);
+ return qdisc_drop(skb, sch);
}
ret = qdisc_enqueue(skb, q->qdisc);
if (ret != NET_XMIT_SUCCESS) {