diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-07 23:35:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-07 23:35:40 -0400 |
| commit | 0d6c4a2e4641bbc556dd74d3aa158c413a972492 (patch) | |
| tree | da944af17682659bb433dc2282dcb48380c14cd1 /net/sched/sch_netem.c | |
| parent | 6e06c0e2347ec79d0bd5702b2438fe883f784545 (diff) | |
| parent | 1c430a727fa512500a422ffe4712166c550ea06a (diff) | |
| download | op-kernel-dev-0d6c4a2e4641bbc556dd74d3aa158c413a972492.zip op-kernel-dev-0d6c4a2e4641bbc556dd74d3aa158c413a972492.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/param.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans.h
Resolved the iwlwifi conflict with mainline using 3-way diff posted
by John Linville and Stephen Rothwell. In 'net' we added a bug
fix to make iwlwifi report a more accurate skb->truesize but this
conflicted with RX path changes that happened meanwhile in net-next.
In e1000e a conflict arose in the validation code for settings of
adapter->itr. 'net-next' had more sophisticated logic so that
logic was used.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 231cd11..a2a95aa 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -413,10 +413,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) { if (!(skb = skb_unshare(skb, GFP_ATOMIC)) || (skb->ip_summed == CHECKSUM_PARTIAL && - skb_checksum_help(skb))) { - sch->qstats.drops++; - return NET_XMIT_DROP; - } + skb_checksum_help(skb))) + return qdisc_drop(skb, sch); skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8); } |
