Author: nbd Date: 2014-07-29 00:52:39 +0200 (Tue, 29 Jul 2014) New Revision: 41863
Modified: trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch Log: hostapd: add more missing ifdefs Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch =================================================================== --- trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch 2014-07-28 20:35:53 UTC (rev 41862) +++ trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch 2014-07-28 22:52:39 UTC (rev 41863) @@ -42,6 +42,15 @@ --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c +@@ -1602,7 +1602,7 @@ static int wpa_supplicant_ctrl_iface_sta + pos += ret; + } + +-#ifdef CONFIG_AP ++#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB) + if (wpa_s->ap_iface) { + pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos, + end - pos, @@ -6243,6 +6243,7 @@ char * wpa_supplicant_ctrl_iface_process reply_len = -1; } else if (os_strncmp(buf, "NOTE ", 5) == 0) { @@ -66,14 +75,22 @@ } else if (os_strcmp(buf, "STA-FIRST") == 0) { reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size); } else if (os_strncmp(buf, "STA ", 4) == 0) { -@@ -6669,6 +6672,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -6669,12 +6672,15 @@ char * wpa_supplicant_ctrl_iface_process } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply, reply_size); +#endif ++#ifdef CONFIG_CTRL_IFACE_MIB } else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) { if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15)) reply_len = -1; + } else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) { + if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13)) + reply_len = -1; ++#endif + } else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) { + if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12)) + reply_len = -1; --- a/src/ap/ctrl_iface_ap.c +++ b/src/ap/ctrl_iface_ap.c @@ -21,6 +21,7 @@ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
