diff options
author | Florian Westphal <fw@strlen.de> | 2016-06-08 18:27:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-09 02:58:52 -0400 |
commit | a09ceb0e08140a1eec05b49b4c232d3481339cb0 (patch) | |
tree | d177eeb840ee48563ba195fa6de159125fa1019b /include/net/sch_generic.h | |
parent | c3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2 (diff) |
sched: remove qdisc->drop
after removal of TCA_CBQ_OVL_STRATEGY from cbq scheduler, there are no
more callers of ->drop() outside of other ->drop functions, i.e.
nothing calls them.
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.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index a9aec633d467..4dedb7f12ed5 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -174,7 +174,6 @@ struct Qdisc_ops { | |||
174 | int (*enqueue)(struct sk_buff *, struct Qdisc *); | 174 | int (*enqueue)(struct sk_buff *, struct Qdisc *); |
175 | struct sk_buff * (*dequeue)(struct Qdisc *); | 175 | struct sk_buff * (*dequeue)(struct Qdisc *); |
176 | struct sk_buff * (*peek)(struct Qdisc *); | 176 | struct sk_buff * (*peek)(struct Qdisc *); |
177 | unsigned int (*drop)(struct Qdisc *); | ||
178 | 177 | ||
179 | int (*init)(struct Qdisc *, struct nlattr *arg); | 178 | int (*init)(struct Qdisc *, struct nlattr *arg); |
180 | void (*reset)(struct Qdisc *); | 179 | void (*reset)(struct Qdisc *); |
@@ -658,22 +657,6 @@ static inline unsigned int qdisc_queue_drop_head(struct Qdisc *sch) | |||
658 | return __qdisc_queue_drop_head(sch, &sch->q); | 657 | return __qdisc_queue_drop_head(sch, &sch->q); |
659 | } | 658 | } |
660 | 659 | ||
661 | static inline struct sk_buff *__qdisc_dequeue_tail(struct Qdisc *sch, | ||
662 | struct sk_buff_head *list) | ||
663 | { | ||
664 | struct sk_buff *skb = __skb_dequeue_tail(list); | ||
665 | |||
666 | if (likely(skb != NULL)) | ||
667 | qdisc_qstats_backlog_dec(sch, skb); | ||
668 | |||
669 | return skb; | ||
670 | } | ||
671 | |||
672 | static inline struct sk_buff *qdisc_dequeue_tail(struct Qdisc *sch) | ||
673 | { | ||
674 | return __qdisc_dequeue_tail(sch, &sch->q); | ||
675 | } | ||
676 | |||
677 | static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch) | 660 | static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch) |
678 | { | 661 | { |
679 | return skb_peek(&sch->q); | 662 | return skb_peek(&sch->q); |
@@ -741,25 +724,6 @@ static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, | |||
741 | return old; | 724 | return old; |
742 | } | 725 | } |
743 | 726 | ||
744 | static inline unsigned int __qdisc_queue_drop(struct Qdisc *sch, | ||
745 | struct sk_buff_head *list) | ||
746 | { | ||
747 | struct sk_buff *skb = __qdisc_dequeue_tail(sch, list); | ||
748 | |||
749 | if (likely(skb != NULL)) { | ||
750 | unsigned int len = qdisc_pkt_len(skb); | ||
751 | kfree_skb(skb); | ||
752 | return len; | ||
753 | } | ||
754 | |||
755 | return 0; | ||
756 | } | ||
757 | |||
758 | static inline unsigned int qdisc_queue_drop(struct Qdisc *sch) | ||
759 | { | ||
760 | return __qdisc_queue_drop(sch, &sch->q); | ||
761 | } | ||
762 | |||
763 | static inline int qdisc_drop(struct sk_buff *skb, struct Qdisc *sch) | 727 | static inline int qdisc_drop(struct sk_buff *skb, struct Qdisc *sch) |
764 | { | 728 | { |
765 | kfree_skb(skb); | 729 | kfree_skb(skb); |