From: Adrien Schildknecht <adrien+dev@schischi.me>
To: trinity@vger.kernel.org
Cc: Adrien Schildknecht <adrien+dev@schischi.me>
Subject: [PATCH] net: include <linux/if.h> instead of <net/if.h>
Date: Thu, 10 Mar 2016 15:31:49 -0800 [thread overview]
Message-ID: <1457652709-13314-1-git-send-email-adrien+dev@schischi.me> (raw)
Commit 4ada80dd202675 includes net/if.h and linux/netfilter_ipv4/ip_tables.h
net/* and linux/* should not be mixed.
Debian Jessie x86_64:
CC net/proto-ipv4.o
In file included from net/proto-ipv4.c:11:0:
/usr/include/linux/if.h:71:2: error: redeclaration of enumerator 'IFF_UP'
IFF_UP = 1<<0, /* sysfs */
/usr/include/net/if.h:44:5: note: previous definition of 'IFF_UP' was here
IFF_UP = 0x1, /* Interface is up. */
[...]
Signed-off-by: Adrien Schildknecht <adrien+dev@schischi.me>
---
net/proto-ipv4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/proto-ipv4.c b/net/proto-ipv4.c
index dc9aa48..0be0263 100644
--- a/net/proto-ipv4.c
+++ b/net/proto-ipv4.c
@@ -8,7 +8,7 @@
#include <linux/types.h>
#include <arpa/inet.h>
#include <linux/mroute.h>
-#include <net/if.h>
+#include <linux/if.h>
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_arp/arp_tables.h>
--
2.7.2
reply other threads:[~2016-03-10 23:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457652709-13314-1-git-send-email-adrien+dev@schischi.me \
--to=adrien+dev@schischi.me \
--cc=trinity@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).