aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/sch_generic.h
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-06-08 18:27:41 -0400
committerDavid S. Miller <davem@davemloft.net>2016-06-09 02:58:51 -0400
commitc3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2 (patch)
tree52e2931588e37db52cafb4ec79e08579609e20a8 /include/net/sch_generic.h
parentdd47c1fa776cda48531b651c88341e951140b0a7 (diff)
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 'include/net/sch_generic.h')
-rw-r--r--include/net/sch_generic.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index c069ac1dd75d..a9aec633d467 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -63,9 +63,6 @@ struct Qdisc {
63 struct list_head list; 63 struct list_head list;
64 u32 handle; 64 u32 handle;
65 u32 parent; 65 u32 parent;
66 int (*reshape_fail)(struct sk_buff *skb,
67 struct Qdisc *q);
68
69 void *u32_node; 66 void *u32_node;
70 67
71 struct netdev_queue *dev_queue; 68 struct netdev_queue *dev_queue;
@@ -771,22 +768,6 @@ static inline int qdisc_drop(struct sk_buff *skb, struct Qdisc *sch)
771 return NET_XMIT_DROP; 768 return NET_XMIT_DROP;
772} 769}
773 770
774static inline int qdisc_reshape_fail(struct sk_buff *skb, struct Qdisc *sch)
775{
776 qdisc_qstats_drop(sch);
777
778#ifdef CONFIG_NET_CLS_ACT
779 if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch))
780 goto drop;
781
782 return NET_XMIT_SUCCESS;
783
784drop:
785#endif
786 kfree_skb(skb);
787 return NET_XMIT_DROP;
788}
789
790/* Length to Time (L2T) lookup in a qdisc_rate_table, to determine how 771/* Length to Time (L2T) lookup in a qdisc_rate_table, to determine how
791 long it will take to send a packet given its size. 772 long it will take to send a packet given its size.
792 */ 773 */