diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/codel.h | 4 | ||||
-rw-r--r-- | include/net/ip_vs.h | 17 | ||||
-rw-r--r-- | include/net/sch_generic.h | 20 |
3 files changed, 1 insertions, 40 deletions
diff --git a/include/net/codel.h b/include/net/codel.h index d168aca115cc..267e70210061 100644 --- a/include/net/codel.h +++ b/include/net/codel.h @@ -162,14 +162,12 @@ struct codel_vars { * struct codel_stats - contains codel shared variables and stats * @maxpacket: largest packet we've seen so far * @drop_count: temp count of dropped packets in dequeue() - * @drop_len: bytes of dropped packets in dequeue() * ecn_mark: number of packets we ECN marked instead of dropping * ce_mark: number of packets CE marked because sojourn time was above ce_threshold */ struct codel_stats { u32 maxpacket; u32 drop_count; - u32 drop_len; u32 ecn_mark; u32 ce_mark; }; @@ -310,7 +308,6 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch, vars->rec_inv_sqrt); goto end; } - stats->drop_len += qdisc_pkt_len(skb); qdisc_drop(skb, sch); stats->drop_count++; skb = dequeue_func(vars, sch); @@ -333,7 +330,6 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch, if (params->ecn && INET_ECN_set_ce(skb)) { stats->ecn_mark++; } else { - stats->drop_len += qdisc_pkt_len(skb); qdisc_drop(skb, sch); stats->drop_count++; diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index a6cc576fd467..0816c872b689 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1588,23 +1588,6 @@ static inline void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) } #endif /* CONFIG_IP_VS_NFCT */ -/* Really using conntrack? */ -static inline bool ip_vs_conn_uses_conntrack(struct ip_vs_conn *cp, - struct sk_buff *skb) -{ -#ifdef CONFIG_IP_VS_NFCT - enum ip_conntrack_info ctinfo; - struct nf_conn *ct; - - if (!(cp->flags & IP_VS_CONN_F_NFCT)) - return false; - ct = nf_ct_get(skb, &ctinfo); - if (ct && !nf_ct_is_untracked(ct)) - return true; -#endif - return false; -} - static inline int ip_vs_dest_conn_overhead(struct ip_vs_dest *dest) { diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 86df0835f6b5..b2a8e6338576 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -396,8 +396,7 @@ struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, struct Qdisc *qdisc); void qdisc_reset(struct Qdisc *qdisc); void qdisc_destroy(struct Qdisc *qdisc); -void qdisc_tree_reduce_backlog(struct Qdisc *qdisc, unsigned int n, - unsigned int len); +void qdisc_tree_decrease_qlen(struct Qdisc *qdisc, unsigned int n); struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, const struct Qdisc_ops *ops); struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, @@ -699,23 +698,6 @@ static inline void qdisc_reset_queue(struct Qdisc *sch) sch->qstats.backlog = 0; } -static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, - struct Qdisc **pold) -{ - struct Qdisc *old; - - sch_tree_lock(sch); - old = *pold; - *pold = new; - if (old != NULL) { - qdisc_tree_reduce_backlog(old, old->q.qlen, old->qstats.backlog); - qdisc_reset(old); - } - sch_tree_unlock(sch); - - return old; -} - static inline unsigned int __qdisc_queue_drop(struct Qdisc *sch, struct sk_buff_head *list) { |