diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2018-05-31 00:10:49 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2018-05-31 00:38:16 +0200 |
| commit | 78f1974bc565d7544589a49ad8efd92c4ddec5b3 (patch) | |
| tree | 2ba738d93778958d880ed37896c2bb617f19b9e1 /package/network/services/hostapd/patches/200-multicall.patch | |
| parent | dad39249fb91d6f320256ac12944863f09bb2dc9 (diff) | |
| download | mtk-20170518-78f1974bc565d7544589a49ad8efd92c4ddec5b3.zip mtk-20170518-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.gz mtk-20170518-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.bz2 | |
hostapd: update packaging and patches
Clean up conflicts/provides/depends hell and add PROVIDES for
eapol-test variants while at it.
Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which
allows to drop two revert-patches for upstream commits which previously
were necessary to un-break mesh-DFS support.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/network/services/hostapd/patches/200-multicall.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/200-multicall.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch index a10037c..273af64 100644 --- a/package/network/services/hostapd/patches/200-multicall.patch +++ b/package/network/services/hostapd/patches/200-multicall.patch @@ -231,7 +231,7 @@ os_memset(&global, 0, sizeof(global)); --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c -@@ -3901,8 +3901,8 @@ static void wpas_event_assoc_reject(stru +@@ -3976,8 +3976,8 @@ static void wpas_event_assoc_reject(stru } @@ -242,7 +242,7 @@ { struct wpa_supplicant *wpa_s = ctx; int resched; -@@ -4669,7 +4669,7 @@ void wpa_supplicant_event(void *ctx, enu +@@ -4745,7 +4745,7 @@ void wpa_supplicant_event(void *ctx, enu } @@ -253,7 +253,7 @@ struct wpa_supplicant *wpa_s; --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -5770,7 +5770,6 @@ struct wpa_interface * wpa_supplicant_ma +@@ -5797,7 +5797,6 @@ struct wpa_interface * wpa_supplicant_ma return NULL; } @@ -261,7 +261,7 @@ /** * wpa_supplicant_match_existing - Match existing interfaces * @global: Pointer to global data from wpa_supplicant_init() -@@ -5807,6 +5806,11 @@ static int wpa_supplicant_match_existing +@@ -5834,6 +5833,11 @@ static int wpa_supplicant_match_existing #endif /* CONFIG_MATCH_IFACE */ @@ -273,7 +273,7 @@ /** * wpa_supplicant_add_iface - Add a new network interface -@@ -6063,6 +6067,8 @@ struct wpa_global * wpa_supplicant_init( +@@ -6090,6 +6094,8 @@ struct wpa_global * wpa_supplicant_init( #ifndef CONFIG_NO_WPA_MSG wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); #endif /* CONFIG_NO_WPA_MSG */ |