summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Schipp <jonschipp@gmail.com>2014-07-22 13:21:58 -0500
committerDaniel Borkmann <dborkman@redhat.com>2014-07-22 21:27:53 +0200
commitc6ac8232cd5e080ad90c9fd0c0a92abc0722c015 (patch)
tree50578ee4ef5d8fb371871b06dc49bb9631c10f03
parentfc0b91758c976de050cf6fc9e905ab677e79c946 (diff)
astraceroute/Makefile: don't build ring_rx.o
Building astraceroute fails on EL systems because TPACKET_V3 is not available. Astraceroute functions properly without ring_rx.o. $ cat /etc/redhat-release CentOS release 6.4 (Final) Pre-patch: Building astraceroute: CC xmalloc.c CC ioops.c CC proto_none.c CC tprintf.c CC bpf.c CC str.c CC sig.c CC sock.c CC link.c CC ring_rx.c In file included from ring_rx.c:21: ring_rx.h:25: warning: ‘struct block_desc’ declared inside parameter list ring_rx.h: In function ‘user_may_pull_from_rx_block’: ring_rx.h:27: error: dereferencing pointer to incomplete type ring_rx.h: At top level: ring_rx.h:35: warning: ‘struct block_desc’ declared inside parameter list ring_rx.h: In function ‘kernel_may_pull_from_rx_block’: ring_rx.h:37: error: dereferencing pointer to incomplete type ring_rx.c: In function ‘destroy_rx_ring’: ring_rx.c:26: error: ‘TPACKET_V3’ undeclared (first use in this function) ring_rx.c:26: error: (Each undeclared identifier is reported only once ring_rx.c:26: error: for each function it appears in.) ring_rx.c: In function ‘setup_rx_ring_layout’: ring_rx.c:63: error: dereferencing pointer to incomplete type ring_rx.c:63: error: dereferencing pointer to incomplete type ring_rx.c:68: error: ‘struct ring’ has no member named ‘layout3’ ring_rx.c:69: error: ‘struct ring’ has no member named ‘layout3’ ring_rx.c:70: error: ‘struct ring’ has no member named ‘layout3’ ring_rx.c: In function ‘create_rx_ring’: ring_rx.c:83: error: ‘TPACKET_V3’ undeclared (first use in this function) ring_rx.c:87: error: ‘struct ring’ has no member named ‘layout3’ ring_rx.c: In function ‘alloc_rx_ring_frames’: ring_rx.c:118: error: ‘TPACKET_V3’ undeclared (first use in this function) ring_rx.c:121: error: ‘struct ring’ has no member named ‘layout3’ ring_rx.c:122: error: ‘struct ring’ has no member named ‘layout3’ ring_rx.c: In function ‘sock_rx_net_stats’: ring_rx.c:147: error: ‘TPACKET_V3’ undeclared (first use in this function) ring_rx.c:150: error: field ‘k3’ has incomplete type make: *** [astraceroute/ring_rx.o] Error 1 Post-patch: Building astraceroute: CC xmalloc.c CC ioops.c CC proto_none.c CC tprintf.c CC bpf.c CC str.c CC sig.c CC sock.c CC link.c CC ring.c CC dev.c CC astraceroute.c CC geoip.c LD astraceroute STRIP astraceroute Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
-rw-r--r--astraceroute/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/astraceroute/Makefile b/astraceroute/Makefile
index 5895730..1972a12 100644
--- a/astraceroute/Makefile
+++ b/astraceroute/Makefile
@@ -16,7 +16,6 @@ astraceroute-objs = xmalloc.o \
sock.o \
link.o \
dev.o \
- ring_rx.o \
ring.o \
astraceroute.o