aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_hfsc.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_hfsc.c')
-rw-r--r--net/sched/sch_hfsc.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 6eefa6995777..135087d4213a 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -284,7 +284,7 @@ static inline struct hfsc_class *
284eltree_get_minel(struct hfsc_sched *q) 284eltree_get_minel(struct hfsc_sched *q)
285{ 285{
286 struct rb_node *n; 286 struct rb_node *n;
287 287
288 n = rb_first(&q->eligible); 288 n = rb_first(&q->eligible);
289 if (n == NULL) 289 if (n == NULL)
290 return NULL; 290 return NULL;
@@ -773,7 +773,7 @@ init_vf(struct hfsc_class *cl, unsigned int len)
773 /* update the virtual curve */ 773 /* update the virtual curve */
774 vt = cl->cl_vt + cl->cl_vtoff; 774 vt = cl->cl_vt + cl->cl_vtoff;
775 rtsc_min(&cl->cl_virtual, &cl->cl_fsc, vt, 775 rtsc_min(&cl->cl_virtual, &cl->cl_fsc, vt,
776 cl->cl_total); 776 cl->cl_total);
777 if (cl->cl_virtual.x == vt) { 777 if (cl->cl_virtual.x == vt) {
778 cl->cl_virtual.x -= cl->cl_vtoff; 778 cl->cl_virtual.x -= cl->cl_vtoff;
779 cl->cl_vtoff = 0; 779 cl->cl_vtoff = 0;
@@ -796,10 +796,10 @@ init_vf(struct hfsc_class *cl, unsigned int len)
796 796
797 /* update the ulimit curve */ 797 /* update the ulimit curve */
798 rtsc_min(&cl->cl_ulimit, &cl->cl_usc, cur_time, 798 rtsc_min(&cl->cl_ulimit, &cl->cl_usc, cur_time,
799 cl->cl_total); 799 cl->cl_total);
800 /* compute myf */ 800 /* compute myf */
801 cl->cl_myf = rtsc_y2x(&cl->cl_ulimit, 801 cl->cl_myf = rtsc_y2x(&cl->cl_ulimit,
802 cl->cl_total); 802 cl->cl_total);
803 cl->cl_myfadj = 0; 803 cl->cl_myfadj = 0;
804 } 804 }
805 } 805 }
@@ -853,7 +853,7 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time)
853 * update vt and f 853 * update vt and f
854 */ 854 */
855 cl->cl_vt = rtsc_y2x(&cl->cl_virtual, cl->cl_total) 855 cl->cl_vt = rtsc_y2x(&cl->cl_virtual, cl->cl_total)
856 - cl->cl_vtoff + cl->cl_vtadj; 856 - cl->cl_vtoff + cl->cl_vtadj;
857 857
858 /* 858 /*
859 * if vt of the class is smaller than cvtmin, 859 * if vt of the class is smaller than cvtmin,
@@ -870,7 +870,7 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time)
870 870
871 if (cl->cl_flags & HFSC_USC) { 871 if (cl->cl_flags & HFSC_USC) {
872 cl->cl_myf = cl->cl_myfadj + rtsc_y2x(&cl->cl_ulimit, 872 cl->cl_myf = cl->cl_myfadj + rtsc_y2x(&cl->cl_ulimit,
873 cl->cl_total); 873 cl->cl_total);
874#if 0 874#if 0
875 /* 875 /*
876 * This code causes classes to stay way under their 876 * This code causes classes to stay way under their
@@ -1001,7 +1001,7 @@ hfsc_find_class(u32 classid, struct Qdisc *sch)
1001 1001
1002static void 1002static void
1003hfsc_change_rsc(struct hfsc_class *cl, struct tc_service_curve *rsc, 1003hfsc_change_rsc(struct hfsc_class *cl, struct tc_service_curve *rsc,
1004 u64 cur_time) 1004 u64 cur_time)
1005{ 1005{
1006 sc2isc(rsc, &cl->cl_rsc); 1006 sc2isc(rsc, &cl->cl_rsc);
1007 rtsc_init(&cl->cl_deadline, &cl->cl_rsc, cur_time, cl->cl_cumul); 1007 rtsc_init(&cl->cl_deadline, &cl->cl_rsc, cur_time, cl->cl_cumul);
@@ -1023,7 +1023,7 @@ hfsc_change_fsc(struct hfsc_class *cl, struct tc_service_curve *fsc)
1023 1023
1024static void 1024static void
1025hfsc_change_usc(struct hfsc_class *cl, struct tc_service_curve *usc, 1025hfsc_change_usc(struct hfsc_class *cl, struct tc_service_curve *usc,
1026 u64 cur_time) 1026 u64 cur_time)
1027{ 1027{
1028 sc2isc(usc, &cl->cl_usc); 1028 sc2isc(usc, &cl->cl_usc);
1029 rtsc_init(&cl->cl_ulimit, &cl->cl_usc, cur_time, cl->cl_total); 1029 rtsc_init(&cl->cl_ulimit, &cl->cl_usc, cur_time, cl->cl_total);
@@ -1032,7 +1032,7 @@ hfsc_change_usc(struct hfsc_class *cl, struct tc_service_curve *usc,
1032 1032
1033static int 1033static int
1034hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid, 1034hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
1035 struct rtattr **tca, unsigned long *arg) 1035 struct rtattr **tca, unsigned long *arg)
1036{ 1036{
1037 struct hfsc_sched *q = qdisc_priv(sch); 1037 struct hfsc_sched *q = qdisc_priv(sch);
1038 struct hfsc_class *cl = (struct hfsc_class *)*arg; 1038 struct hfsc_class *cl = (struct hfsc_class *)*arg;
@@ -1228,9 +1228,9 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
1228#ifdef CONFIG_NET_CLS_ACT 1228#ifdef CONFIG_NET_CLS_ACT
1229 switch (result) { 1229 switch (result) {
1230 case TC_ACT_QUEUED: 1230 case TC_ACT_QUEUED:
1231 case TC_ACT_STOLEN: 1231 case TC_ACT_STOLEN:
1232 *qerr = NET_XMIT_SUCCESS; 1232 *qerr = NET_XMIT_SUCCESS;
1233 case TC_ACT_SHOT: 1233 case TC_ACT_SHOT:
1234 return NULL; 1234 return NULL;
1235 } 1235 }
1236#elif defined(CONFIG_NET_CLS_POLICE) 1236#elif defined(CONFIG_NET_CLS_POLICE)
@@ -1259,7 +1259,7 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
1259 1259
1260static int 1260static int
1261hfsc_graft_class(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, 1261hfsc_graft_class(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
1262 struct Qdisc **old) 1262 struct Qdisc **old)
1263{ 1263{
1264 struct hfsc_class *cl = (struct hfsc_class *)arg; 1264 struct hfsc_class *cl = (struct hfsc_class *)arg;
1265 1265
@@ -1397,7 +1397,7 @@ hfsc_dump_curves(struct sk_buff *skb, struct hfsc_class *cl)
1397 1397
1398static int 1398static int
1399hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb, 1399hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb,
1400 struct tcmsg *tcm) 1400 struct tcmsg *tcm)
1401{ 1401{
1402 struct hfsc_class *cl = (struct hfsc_class *)arg; 1402 struct hfsc_class *cl = (struct hfsc_class *)arg;
1403 unsigned char *b = skb->tail; 1403 unsigned char *b = skb->tail;