diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-14 15:08:49 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-14 15:08:46 -0800 |
| commit | 01c47b8a7e64cc8c598aac10887e9ce328bbb2eb (patch) | |
| tree | eaf747311dc8ca2bac9d91520297cbf8f73a0f72 /net/sched/sch_netem.c | |
| parent | 39132a8d3352b23e333779ec68daec8d1ce853da (diff) | |
| parent | 4547f0febbca55057d4249dd6e4e6d509dbc2e46 (diff) | |
Merge "Merge android-4.4-p.200 (903fbe7) into msm-4.4"
Diffstat (limited to 'net/sched/sch_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 2a431628af59..caf33af4f9a7 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -464,7 +464,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) * skb will be queued. */ if (count > 1 && (skb2 = skb_clone(skb, GFP_ATOMIC)) != NULL) { - struct Qdisc *rootq = qdisc_root(sch); + struct Qdisc *rootq = qdisc_root_bh(sch); u32 dupsave = q->duplicate; /* prevent duplicating a dup... */ q->duplicate = 0; |