From e4a362875d2eaf2f35adf7f128ffaec5e2e846b7 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sun, 5 Mar 2017 17:10:56 +0000 Subject: [PATCH] Whitespace tidy up Signed-off-by: Kevin Darbyshire-Bryant --- cobalt.h | 4 ++-- pkt_sched.h | 6 +++--- sch_cake.c | 34 +++++++++++++++++----------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cobalt.h b/cobalt.h index ffc42bf..2837b8f 100644 --- a/cobalt.h +++ b/cobalt.h @@ -88,8 +88,8 @@ struct cobalt_skb_cb { struct cobalt_params { cobalt_time_t interval; cobalt_time_t target; - u32 p_inc; - u32 p_dec; + u32 p_inc; + u32 p_dec; }; /** diff --git a/pkt_sched.h b/pkt_sched.h index 1174524..193cf01 100644 --- a/pkt_sched.h +++ b/pkt_sched.h @@ -884,7 +884,7 @@ struct tc_cake_xstats { __u8 tin_cnt; /* <= TC_CAKE_MAX_TINS */ __u32 threshold_rate [TC_CAKE_MAX_TINS]; - __u32 target_us [TC_CAKE_MAX_TINS]; + __u32 target_us [TC_CAKE_MAX_TINS]; struct tc_cake_traffic_stats sent [TC_CAKE_MAX_TINS]; struct tc_cake_traffic_stats dropped [TC_CAKE_MAX_TINS]; struct tc_cake_traffic_stats ecn_marked[TC_CAKE_MAX_TINS]; @@ -899,11 +899,11 @@ struct tc_cake_xstats { __u16 sparse_flows [TC_CAKE_MAX_TINS]; __u16 bulk_flows [TC_CAKE_MAX_TINS]; __u16 unresponse_flows [TC_CAKE_MAX_TINS]; /* v4 - was u32 last_len */ - __u16 spare [TC_CAKE_MAX_TINS]; /* v4 - split last_len */ + __u16 spare [TC_CAKE_MAX_TINS]; /* v4 - split last_len */ __u32 max_skblen [TC_CAKE_MAX_TINS]; __u32 capacity_estimate; /* version 2 */ __u32 memory_limit; /* version 3 */ - __u32 memory_used; /* version 3 */ + __u32 memory_used; /* version 3 */ }; #endif diff --git a/sch_cake.c b/sch_cake.c index 17f8618..1474dcf 100644 --- a/sch_cake.c +++ b/sch_cake.c @@ -940,7 +940,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff * segs = nskb; } - b->bytes += slen; + b->bytes += slen; b->backlogs[idx] += slen; b->tin_backlog += slen; sch->qstats.backlog += slen; @@ -956,7 +956,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff * /* stats */ sch->q.qlen++; b->packets++; - b->bytes += len; + b->bytes += len; b->backlogs[idx] += len; b->tin_backlog += len; sch->qstats.backlog += len; @@ -1067,9 +1067,9 @@ static struct sk_buff *cake_dequeue_one(struct Qdisc *sch) skb = dequeue_head(flow); len = qdisc_pkt_len(skb); b->backlogs[q->cur_flow] -= len; - b->tin_backlog -= len; + b->tin_backlog -= len; sch->qstats.backlog -= len; - q->buffer_used -= skb->truesize; + q->buffer_used -= skb->truesize; sch->q.qlen--; if(q->overflow_timeout) @@ -1282,17 +1282,17 @@ static void cake_reset(struct Qdisc *sch) static const struct nla_policy cake_policy[TCA_CAKE_MAX + 1] = { [TCA_CAKE_BASE_RATE] = { .type = NLA_U32 }, [TCA_CAKE_DIFFSERV_MODE] = { .type = NLA_U32 }, - [TCA_CAKE_ATM] = { .type = NLA_U32 }, + [TCA_CAKE_ATM] = { .type = NLA_U32 }, [TCA_CAKE_FLOW_MODE] = { .type = NLA_U32 }, [TCA_CAKE_OVERHEAD] = { .type = NLA_S32 }, - [TCA_CAKE_RTT] = { .type = NLA_U32 }, - [TCA_CAKE_TARGET] = { .type = NLA_U32 }, + [TCA_CAKE_RTT] = { .type = NLA_U32 }, + [TCA_CAKE_TARGET] = { .type = NLA_U32 }, [TCA_CAKE_AUTORATE] = { .type = NLA_U32 }, - [TCA_CAKE_MEMORY] = { .type = NLA_U32 }, - [TCA_CAKE_NAT] = { .type = NLA_U32 }, + [TCA_CAKE_MEMORY] = { .type = NLA_U32 }, + [TCA_CAKE_NAT] = { .type = NLA_U32 }, [TCA_CAKE_ETHERNET] = { .type = NLA_U32 }, - [TCA_CAKE_WASH] = { .type = NLA_U32 }, - [TCA_CAKE_MPU] = { .type = NLA_U32 }, + [TCA_CAKE_WASH] = { .type = NLA_U32 }, + [TCA_CAKE_MPU] = { .type = NLA_U32 }, }; static void cake_set_rate(struct cake_tin_data *b, u64 rate, u32 mtu, @@ -1586,7 +1586,7 @@ static int cake_config_diffserv_llt(struct Qdisc *sch) q->tin_cnt = 5; /* codepoint to class mapping */ - q->tin_index = diffserv_llt; + q->tin_index = diffserv_llt; /* class characteristics */ cake_set_rate(&q->tins[0], rate, mtu, @@ -1934,7 +1934,7 @@ static int cake_dump_stats(struct Qdisc *sch, struct gnet_dump *d) /* TODO FIXME: add missing aspects of these composite stats */ st->sent[i].packets = b->packets; - st->sent[i].bytes = b->bytes; + st->sent[i].bytes = b->bytes; st->dropped[i].packets = b->tin_dropped; st->ecn_marked[i].packets = b->tin_ecn_mark; st->backlog[i].bytes = b->tin_backlog; @@ -1944,14 +1944,14 @@ static int cake_dump_stats(struct Qdisc *sch, struct gnet_dump *d) st->base_delay_us[i] = cobalt_time_to_us(b->base_delay); st->way_indirect_hits[i] = b->way_hits; - st->way_misses[i] = b->way_misses; + st->way_misses[i] = b->way_misses; st->way_collisions[i] = b->way_collisions; st->sparse_flows[i] = b->sparse_flow_count + b->decaying_flow_count; - st->bulk_flows[i] = b->bulk_flow_count; + st->bulk_flows[i] = b->bulk_flow_count; st->unresponse_flows[i] = b->unresponsive_flow_count; - st->spare[i] = 0; - st->max_skblen[i] = b->max_skblen; + st->spare[i] = 0; + st->max_skblen[i] = b->max_skblen; } st->capacity_estimate = q->avg_peak_bandwidth; st->memory_limit = q->buffer_limit;