Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79287
b: refs/heads/master
c: d46f8dd
h: refs/heads/master
i:
  79285: 831e707
  79283: bb17ad7
  79279: a5f40e1
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Jan 28, 2008
1 parent 395b3b0 commit abcf5c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d3e994830d35159320d0a98c36aa580410c29609
refs/heads/master: d46f8dd87d9e7d5356891cbe97b8472e74db1413
6 changes: 3 additions & 3 deletions trunk/net/sched/sch_sfq.c
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ static void sfq_perturbation(unsigned long arg)
struct Qdisc *sch = (struct Qdisc*)arg;
struct sfq_sched_data *q = qdisc_priv(sch);

get_random_bytes(&q->perturbation, 4);
q->perturbation = net_random();

if (q->perturb_period)
mod_timer(&q->perturb_timer, jiffies + q->perturb_period);
Expand Down Expand Up @@ -415,7 +415,7 @@ static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
del_timer(&q->perturb_timer);
if (q->perturb_period) {
mod_timer(&q->perturb_timer, jiffies + q->perturb_period);
get_random_bytes(&q->perturbation, 4);
q->perturbation = net_random();
}
sch_tree_unlock(sch);
return 0;
Expand Down Expand Up @@ -443,7 +443,7 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
if (opt == NULL) {
q->quantum = psched_mtu(sch->dev);
q->perturb_period = 0;
get_random_bytes(&q->perturbation, 4);
q->perturbation = net_random();
} else {
int err = sfq_change(sch, opt);
if (err)
Expand Down

0 comments on commit abcf5c8

Please sign in to comment.