Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a173d7 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd47c1fa

include/net/sch_generic.h

+0 −19
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ struct Qdisc { 
	struct list_head	list;

	u32			handle;

	u32			parent;

	int			(*reshape_fail)(struct sk_buff *skb,

					struct Qdisc *q);



	void			*u32_node;



	struct netdev_queue	*dev_queue;
@@ -771,22 +768,6 @@ static inline int qdisc_drop(struct sk_buff *skb, struct Qdisc *sch) 
	return NET_XMIT_DROP;

}



static inline int qdisc_reshape_fail(struct sk_buff *skb, struct Qdisc *sch)

{

	qdisc_qstats_drop(sch);



#ifdef CONFIG_NET_CLS_ACT

	if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch))

		goto drop;



	return NET_XMIT_SUCCESS;



drop:

#endif

	kfree_skb(skb);

	return NET_XMIT_DROP;

}



/* Length to Time (L2T) lookup in a qdisc_rate_table, to determine how

   long it will take to send a packet given its size.

 */

net/sched/sch_fifo.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int bfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	if (likely(sch->qstats.backlog + qdisc_pkt_len(skb) <= sch->limit))

		return qdisc_enqueue_tail(skb, sch);



	return qdisc_reshape_fail(skb, sch);

	return qdisc_drop(skb, sch);

}



static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
@@ -32,7 +32,7 @@ static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	if (likely(skb_queue_len(&sch->q) < sch->limit))

		return qdisc_enqueue_tail(skb, sch);



	return qdisc_reshape_fail(skb, sch);

	return qdisc_drop(skb, sch);

}



static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)

net/sched/sch_netem.c

+2 −2
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static struct sk_buff *netem_segment(struct sk_buff *skb, struct Qdisc *sch) 
	segs = skb_gso_segment(skb, features & ~NETIF_F_GSO_MASK);



	if (IS_ERR_OR_NULL(segs)) {

		qdisc_reshape_fail(skb, sch);

		qdisc_drop(skb, sch);

		return NULL;

	}

	consume_skb(skb);
@@ -499,7 +499,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	}



	if (unlikely(skb_queue_len(&sch->q) >= sch->limit))

		return qdisc_reshape_fail(skb, sch);

		return qdisc_drop(skb, sch);



	qdisc_qstats_backlog_inc(sch, skb);

net/sched/sch_plug.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int plug_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		return qdisc_enqueue_tail(skb, sch);

	}



	return qdisc_reshape_fail(skb, sch);

	return qdisc_drop(skb, sch);

}



static struct sk_buff *plug_dequeue(struct Qdisc *sch)

net/sched/sch_tbf.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {