Author: nbd Date: 2014-06-05 23:14:02 +0200 (Thu, 05 Jun 2014) New Revision: 41023
Added: trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch Modified: trunk/package/network/services/hostapd/patches/200-multicall.patch trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch trunk/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch trunk/package/network/services/hostapd/patches/502-wpa_s-support-htmode-param.patch Log: hostapd: fix wpad-mini compile error (#16700) Signed-off-by: Felix Fietkau <[email protected]> Added: trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch =================================================================== --- trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch (rev 0) +++ trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch 2014-06-05 21:14:02 UTC (rev 41023) @@ -0,0 +1,14 @@ +--- a/wpa_supplicant/wpa_supplicant.c ++++ b/wpa_supplicant/wpa_supplicant.c +@@ -247,9 +247,10 @@ void wpa_supplicant_cancel_auth_timeout( + */ + void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s) + { ++ struct wpa_ssid *ssid = wpa_s->current_ssid; ++ + #ifdef IEEE8021X_EAPOL + struct eapol_config eapol_conf; +- struct wpa_ssid *ssid = wpa_s->current_ssid; + + #ifdef CONFIG_IBSS_RSN + if (ssid->mode == WPAS_MODE_IBSS && Modified: trunk/package/network/services/hostapd/patches/200-multicall.patch =================================================================== --- trunk/package/network/services/hostapd/patches/200-multicall.patch 2014-06-05 15:58:01 UTC (rev 41022) +++ trunk/package/network/services/hostapd/patches/200-multicall.patch 2014-06-05 21:14:02 UTC (rev 41023) @@ -192,7 +192,7 @@ --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -3810,6 +3810,9 @@ static void wpa_supplicant_deinit_iface( +@@ -3811,6 +3811,9 @@ static void wpa_supplicant_deinit_iface( os_free(wpa_s); } @@ -202,7 +202,7 @@ /** * wpa_supplicant_add_iface - Add a new network interface -@@ -4001,6 +4004,7 @@ struct wpa_global * wpa_supplicant_init( +@@ -4002,6 +4005,7 @@ struct wpa_global * wpa_supplicant_init( wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); #endif /* CONFIG_NO_WPA_MSG */ Modified: trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch =================================================================== --- trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch 2014-06-05 15:58:01 UTC (rev 41022) +++ trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch 2014-06-05 21:14:02 UTC (rev 41023) @@ -1,6 +1,6 @@ --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -2751,7 +2751,7 @@ static struct wpa_supplicant * wpa_suppl +@@ -2752,7 +2752,7 @@ static struct wpa_supplicant * wpa_suppl if (wpa_s == NULL) return NULL; wpa_s->scan_req = INITIAL_SCAN_REQ; Modified: trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch =================================================================== --- trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch 2014-06-05 15:58:01 UTC (rev 41022) +++ trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch 2014-06-05 21:14:02 UTC (rev 41023) @@ -101,7 +101,7 @@ /* Configure default/group WEP keys for static WEP */ int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { -@@ -710,8 +759,12 @@ void wpa_supplicant_set_state(struct wpa +@@ -711,8 +760,12 @@ void wpa_supplicant_set_state(struct wpa #endif /* CONFIG_P2P */ sme_sched_obss_scan(wpa_s, 1); @@ -114,7 +114,7 @@ wpa_s->new_connection = 1; wpa_drv_set_operstate(wpa_s, 0); #ifndef IEEE8021X_EAPOL -@@ -3594,6 +3647,20 @@ static int wpa_supplicant_init_iface(str +@@ -3595,6 +3648,20 @@ static int wpa_supplicant_init_iface(str sizeof(wpa_s->bridge_ifname)); } @@ -135,7 +135,7 @@ /* RSNA Supplicant Key Management - INITIALIZE */ eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE); eapol_sm_notify_portValid(wpa_s->eapol, FALSE); -@@ -3797,6 +3864,11 @@ static void wpa_supplicant_deinit_iface( +@@ -3798,6 +3865,11 @@ static void wpa_supplicant_deinit_iface( if (terminate) wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); Modified: trunk/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch =================================================================== --- trunk/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch 2014-06-05 15:58:01 UTC (rev 41022) +++ trunk/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch 2014-06-05 21:14:02 UTC (rev 41023) @@ -175,7 +175,7 @@ * macsec_policy - Determines the policy for MACsec secure session --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -1805,6 +1805,13 @@ static void wpas_start_assoc_cb(struct w +@@ -1806,6 +1806,13 @@ static void wpas_start_assoc_cb(struct w params.beacon_int = ssid->beacon_int; else params.beacon_int = wpa_s->conf->beacon_int; Modified: trunk/package/network/services/hostapd/patches/502-wpa_s-support-htmode-param.patch =================================================================== --- trunk/package/network/services/hostapd/patches/502-wpa_s-support-htmode-param.patch 2014-06-05 15:58:01 UTC (rev 41022) +++ trunk/package/network/services/hostapd/patches/502-wpa_s-support-htmode-param.patch 2014-06-05 21:14:02 UTC (rev 41023) @@ -145,7 +145,7 @@ /** --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -1812,6 +1812,8 @@ static void wpas_start_assoc_cb(struct w +@@ -1813,6 +1813,8 @@ static void wpas_start_assoc_cb(struct w i++; } params.mcast_rate = ssid->mcast_rate; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
