Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24477e57 authored Apr 08, 2015 by Pablo Neira Ayuso

uapi: ebtables: don't include linux/if.h



linux/if.h creates conflicts in userspace with net/if.h

By using it here we force userspace to use linux/if.h while
net/if.h may be needed.

Note that:

include/linux/netfilter_ipv4/ip_tables.h and
include/linux/netfilter_ipv6/ip6_tables.h

don't include linux/if.h and they also refer to IFNAMSIZ, so they are
expecting userspace to include use net/if.h from the client program.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 7d740264

include/linux/netfilter_bridge/ebtables.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,9 +12,10 @@
	#ifndef __LINUX_BRIDGE_EFF_H		#ifndef __LINUX_BRIDGE_EFF_H
	#define __LINUX_BRIDGE_EFF_H		#define __LINUX_BRIDGE_EFF_H

			#include <linux/if.h>
			#include <linux/if_ether.h>
	#include <uapi/linux/netfilter_bridge/ebtables.h>		#include <uapi/linux/netfilter_bridge/ebtables.h>


	/* return values for match() functions */		/* return values for match() functions */
	#define EBT_MATCH 0		#define EBT_MATCH 0
	#define EBT_NOMATCH 1		#define EBT_NOMATCH 1

include/uapi/linux/netfilter_bridge/ebtables.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -12,9 +12,7 @@

	#ifndef _UAPI__LINUX_BRIDGE_EFF_H		#ifndef _UAPI__LINUX_BRIDGE_EFF_H
	#define _UAPI__LINUX_BRIDGE_EFF_H		#define _UAPI__LINUX_BRIDGE_EFF_H
	#include <linux/if.h>
	#include <linux/netfilter_bridge.h>		#include <linux/netfilter_bridge.h>
	#include <linux/if_ether.h>

	#define EBT_TABLE_MAXNAMELEN 32		#define EBT_TABLE_MAXNAMELEN 32
	#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN		#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN