diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:19:12 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:18 (GMT) |
| commit | 86ba38e6f5f2fbfe9b49e153ea89593b26482019 (patch) | |
| tree | f99d2906b0eafca507f37289e68052fc105cc2dc /net/packet | |
| parent | 07c8b57b111585a617b2b456497fc9b33c00743c (diff) | |
| download | linux-fsl-qoriq-86ba38e6f5f2fbfe9b49e153ea89593b26482019.tar.xz | |
Reset to 3.12.19
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index d1705d0..88cfbc1 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -63,7 +63,6 @@ #include <linux/if_packet.h> #include <linux/wireless.h> #include <linux/kernel.h> -#include <linux/delay.h> #include <linux/kmod.h> #include <linux/slab.h> #include <linux/vmalloc.h> @@ -631,7 +630,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data) if (BLOCK_NUM_PKTS(pbd)) { while (atomic_read(&pkc->blk_fill_in_prog)) { /* Waiting for skb_copy_bits to finish... */ - cpu_chill(); + cpu_relax(); } } @@ -882,7 +881,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc, if (!(status & TP_STATUS_BLK_TMO)) { while (atomic_read(&pkc->blk_fill_in_prog)) { /* Waiting for skb_copy_bits to finish... */ - cpu_chill(); + cpu_relax(); } } prb_close_block(pkc, pbd, po, status); |