History

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.

Pablo Neira Ayuso committed 11 years ago

Commit 24477e51 parent 7d740262 files · +2 −3Browse files

Unified · Split

2 files
  1. include/linux/netfilter_bridge/ebtables.h +2 −1
  2. include/uapi/linux/netfilter_bridge/ebtables.h +0 −2
include/linux/netfilter_bridge/ebtables.h+2−1
@@ -12,9 +12,10 @@ · 11 unmodified lines
12#ifndef __LINUX_BRIDGE_EFF_H12#ifndef __LINUX_BRIDGE_EFF_H
13#define __LINUX_BRIDGE_EFF_H13#define __LINUX_BRIDGE_EFF_H
14 14
15#include <linux/if.h>
16#include <linux/if_ether.h>
15#include <uapi/linux/netfilter_bridge/ebtables.h>17#include <uapi/linux/netfilter_bridge/ebtables.h>
16 18
17
18/* return values for match() functions */19/* return values for match() functions */
19#define EBT_MATCH 020#define EBT_MATCH 0
20#define EBT_NOMATCH 121#define EBT_NOMATCH 1
include/uapi/linux/netfilter_bridge/ebtables.h+0−2
@@ -12,9 +12,7 @@ · 11 unmodified lines
12 12
13#ifndef _UAPI__LINUX_BRIDGE_EFF_H13#ifndef _UAPI__LINUX_BRIDGE_EFF_H
14#define _UAPI__LINUX_BRIDGE_EFF_H14#define _UAPI__LINUX_BRIDGE_EFF_H
15#include <linux/if.h>
16#include <linux/netfilter_bridge.h>15#include <linux/netfilter_bridge.h>
17#include <linux/if_ether.h>
18 16
19#define EBT_TABLE_MAXNAMELEN 3217#define EBT_TABLE_MAXNAMELEN 32
20#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN18#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN