From f0ac9afe695ed297caf093f02144b2adf04bca87 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 19 Jul 2018 17:13:25 +0200 Subject: [PATCH] hostapd: remove unused struct hostapd_ubus_iface Signed-off-by: Felix Fietkau --- .../services/hostapd/patches/600-ubus_support.patch | 11 +---------- package/network/services/hostapd/src/src/ap/ubus.h | 6 ------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch index 022f02d0f1..a4c4a67fc3 100644 --- a/package/network/services/hostapd/patches/600-ubus_support.patch +++ b/package/network/services/hostapd/patches/600-ubus_support.patch @@ -30,16 +30,7 @@ int interface_added; /* virtual interface added for this BSS */ unsigned int started:1; unsigned int disabled:1; -@@ -392,6 +394,8 @@ struct hostapd_iface { - struct hostapd_config *conf; - char phy[16]; /* Name of the PHY (radio) */ - -+ struct hostapd_ubus_iface ubus; -+ - enum hostapd_iface_state { - HAPD_IFACE_UNINITIALIZED, - HAPD_IFACE_DISABLED, -@@ -544,6 +548,7 @@ hostapd_alloc_bss_data(struct hostapd_if +@@ -544,6 +546,7 @@ hostapd_alloc_bss_data(struct hostapd_if struct hostapd_bss_config *bss); int hostapd_setup_interface(struct hostapd_iface *iface); int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err); diff --git a/package/network/services/hostapd/src/src/ap/ubus.h b/package/network/services/hostapd/src/src/ap/ubus.h index e3ff981c7d..ca63b34cb7 100644 --- a/package/network/services/hostapd/src/src/ap/ubus.h +++ b/package/network/services/hostapd/src/src/ap/ubus.h @@ -30,10 +30,6 @@ struct hostapd_data; #include #include -struct hostapd_ubus_iface { - struct ubus_object obj; -}; - struct hostapd_ubus_bss { struct ubus_object obj; struct avl_tree banned; @@ -50,8 +46,6 @@ void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 * #else -struct hostapd_ubus_iface {}; - struct hostapd_ubus_bss {}; static inline void hostapd_ubus_add_iface(struct hostapd_iface *iface)