jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use a separate header file for Linux bridge interface definitions

Browse source 
This moves the BRCTL_* defines from vlan_full.c to linux_bridge.h to
clean up header inclusion.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2016-03-26 11:27:18 +02:00
parent c815fab83a
commit 9b7cd5788a
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ap/vlan_full.c
View file

@ -13,19 +13,10 @@
/* Avoid conflicts due to NetBSD net/if.h if_type define with driver.h */ /* Avoid conflicts due to NetBSD net/if.h if_type define with driver.h */
#undef if_type #undef if_type
#include <sys/ioctl.h> #include <sys/ioctl.h>
/* From linux/if_bridge.h that can conflict with C library headers for IPv6 */
#define BRCTL_GET_VERSION 0
#define BRCTL_GET_BRIDGES 1
#define BRCTL_ADD_BRIDGE 2
#define BRCTL_DEL_BRIDGE 3
#define BRCTL_ADD_IF 4
#define BRCTL_DEL_IF 5
#define BRCTL_GET_BRIDGE_INFO 6
#define BRCTL_GET_PORT_LIST 7
#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
#include "utils/common.h" #include "utils/common.h"
#include "drivers/priv_netlink.h" #include "drivers/priv_netlink.h"
#include "common/linux_bridge.h"
#include "common/linux_vlan.h" #include "common/linux_vlan.h"
#include "utils/eloop.h" #include "utils/eloop.h"
#include "hostapd.h" #include "hostapd.h"

24
src/common/linux_bridge.h Normal file
View file

@ -0,0 +1,24 @@
/*
* Linux bridge configuration kernel interface
* Copyright (c) 2016, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#ifndef LINUX_BRIDGE_H
#define LINUX_BRIDGE_H
/* This interface is defined in linux/if_bridge.h */
#define BRCTL_GET_VERSION 0
#define BRCTL_GET_BRIDGES 1
#define BRCTL_ADD_BRIDGE 2
#define BRCTL_DEL_BRIDGE 3
#define BRCTL_ADD_IF 4
#define BRCTL_DEL_IF 5
#define BRCTL_GET_BRIDGE_INFO 6
#define BRCTL_GET_PORT_LIST 7
#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
#endif /* LINUX_BRIDGE_H */