summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-08-30 09:46:43 -0700
committerDavid S. Miller <davem@davemloft.net>2013-08-30 14:51:59 -0400
commit08f89b981b0e6b46058dae2957241d4099129521 (patch)
tree49658edcee773763cc9bdf9eedcfd414b41d0d6f /net/sched
parentede23fa8161c1a04aa1b3bf5447812ca14b3fef1 (diff)
downloadlinux-08f89b981b0e6b46058dae2957241d4099129521.tar.gz
linux-08f89b981b0e6b46058dae2957241d4099129521.tar.bz2
linux-08f89b981b0e6b46058dae2957241d4099129521.zip
pkt_sched: fq: prefetch() fix
kbuild bot reported following m68k build error : net/sched/sch_fq.c: In function 'fq_dequeue': >> net/sched/sch_fq.c:491:2: error: implicit declaration of function 'prefetch' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors While we are fixing this, move this prefetch() call a bit earlier. Reported-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_fq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 91ceca7bcb52..32ad015ee8ce 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -46,6 +46,7 @@
#include <linux/slab.h>
#include <linux/rbtree.h>
#include <linux/hash.h>
+#include <linux/prefetch.h>
#include <net/netlink.h>
#include <net/pkt_sched.h>
#include <net/sock.h>
@@ -461,6 +462,7 @@ begin:
}
goto begin;
}
+ prefetch(&skb->end);
f->time_next_packet = now;
f->credit -= qdisc_pkt_len(skb);
@@ -488,7 +490,6 @@ begin:
}
}
out:
- prefetch(&skb->end);
sch->qstats.backlog -= qdisc_pkt_len(skb);
qdisc_bstats_update(sch, skb);
sch->q.qlen--;