From 6fbc585ee38b92cea338e96a5f661c811cd28990 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Thu, 30 May 2013 17:15:33 +0200 Subject: ring: move poll related fallback define to built_in.h It rather belongs to built_in.h, and not here. Signed-off-by: Daniel Borkmann --- built_in.h | 12 ++++++++++++ ring.h | 10 ---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/built_in.h b/built_in.h index 94a39dc..fa2f0c8 100644 --- a/built_in.h +++ b/built_in.h @@ -353,4 +353,16 @@ static inline u64 cpu_to_le64(u64 val) # define TP_STATUS_TS_RAW_HARDWARE (1 << 31) #endif +#ifndef POLLRDNORM +# define POLLRDNORM 0x0040 +#endif + +#ifndef POLLWRNORM +# define POLLWRNORM 0x0100 +#endif + +#ifndef POLLRDHUP +# define POLLRDHUP 0x2000 +#endif + #endif /* BUILT_IN_H */ diff --git a/ring.h b/ring.h index 9737862..facda23 100644 --- a/ring.h +++ b/ring.h @@ -82,16 +82,6 @@ static inline void tpacket_hdr_clone(struct tpacket2_hdr *thdrd, thdrd->tp_len = thdrs->tp_len; } -#ifndef POLLRDNORM -# define POLLRDNORM 0x0040 -#endif -#ifndef POLLWRNORM -# define POLLWRNORM 0x0100 -#endif -#ifndef POLLRDHUP -# define POLLRDHUP 0x2000 -#endif - static inline void prepare_polling(int sock, struct pollfd *pfd) { memset(pfd, 0, sizeof(*pfd)); -- cgit v1.2.3-54-g00ecf