diff options
Diffstat (limited to 'net/sched/sch_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 2b88295cb7b7..d8b10e054627 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -199,9 +199,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
| 199 | * do it now in software before we mangle it. | 199 | * do it now in software before we mangle it. |
| 200 | */ | 200 | */ |
| 201 | if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) { | 201 | if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) { |
| 202 | if (!(skb = skb_unshare(skb, GFP_ATOMIC)) | 202 | if (!(skb = skb_unshare(skb, GFP_ATOMIC)) || |
| 203 | || (skb->ip_summed == CHECKSUM_PARTIAL | 203 | (skb->ip_summed == CHECKSUM_PARTIAL && |
| 204 | && skb_checksum_help(skb))) { | 204 | skb_checksum_help(skb))) { |
| 205 | sch->qstats.drops++; | 205 | sch->qstats.drops++; |
| 206 | return NET_XMIT_DROP; | 206 | return NET_XMIT_DROP; |
| 207 | } | 207 | } |
| @@ -210,9 +210,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | cb = netem_skb_cb(skb); | 212 | cb = netem_skb_cb(skb); |
| 213 | if (q->gap == 0 /* not doing reordering */ | 213 | if (q->gap == 0 || /* not doing reordering */ |
| 214 | || q->counter < q->gap /* inside last reordering gap */ | 214 | q->counter < q->gap || /* inside last reordering gap */ |
| 215 | || q->reorder < get_crandom(&q->reorder_cor)) { | 215 | q->reorder < get_crandom(&q->reorder_cor)) { |
| 216 | psched_time_t now; | 216 | psched_time_t now; |
| 217 | psched_tdiff_t delay; | 217 | psched_tdiff_t delay; |
| 218 | 218 | ||